r4150 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-08-23 04:10:55 -0400 (Sat, 23 Aug 2008)
New Revision: 4150

Modified:
   trunk/data/qcsrc/server/scores_rules.qc
   trunk/data/qcsrc/server/teamplay.qc
Log:
race: hide kills/suicides columns in qualifying


Modified: trunk/data/qcsrc/server/scores_rules.qc
===================================================================
--- trunk/data/qcsrc/server/scores_rules.qc	2008-08-23 06:31:38 UTC (rev 4149)
+++ trunk/data/qcsrc/server/scores_rules.qc	2008-08-23 08:10:55 UTC (rev 4150)
@@ -6,12 +6,25 @@
 float ScoreRules_teams;
 void ScoreRules_basics(float teams, float sprio)
 {
+	float i;
+	for(i = 0; i < MAX_SCORE; ++i)
+		ScoreInfo_SetLabel_PlayerScore(i, "", 0);
+	for(i = 0; i < MAX_TEAMSCORE; ++i)
+		ScoreInfo_SetLabel_TeamScore(i, "", 0);
+
 	ScoreRules_teams = teams;
+
 	if(sprio)
 		ScoreInfo_SetLabel_TeamScore  (ST_SCORE,        "score",     sprio);
-	ScoreInfo_SetLabel_PlayerScore(SP_KILLS,        "kills",     0);
+
+	if(independent_players)
+		ScoreInfo_SetLabel_PlayerScore(SP_KILLS,        "kills",     0);
+
 	ScoreInfo_SetLabel_PlayerScore(SP_DEATHS,       "deaths",    SFL_LOWER_IS_BETTER);
-	ScoreInfo_SetLabel_PlayerScore(SP_SUICIDES,     "suicides",  SFL_LOWER_IS_BETTER);
+
+	if(independent_players)
+		ScoreInfo_SetLabel_PlayerScore(SP_SUICIDES,     "suicides",  SFL_LOWER_IS_BETTER);
+
 	if(sprio)
 		ScoreInfo_SetLabel_PlayerScore(SP_SCORE,        "score",     sprio);
 }

Modified: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc	2008-08-23 06:31:38 UTC (rev 4149)
+++ trunk/data/qcsrc/server/teamplay.qc	2008-08-23 08:10:55 UTC (rev 4150)
@@ -274,6 +274,7 @@
 
 		if(cvar("g_race_teams"))
 		{
+			g_race_qualifying = 0; // not supported!
 			ActivateTeamplay();
 			teams_matter = 1;
 			race_teams = bound(2, cvar("g_race_teams"), 4);