[nexuiz-commits] r7242 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-07-20 00:47:53 -0400 (Mon, 20 Jul 2009)
New Revision: 7242

Modified:
   trunk/data/qcsrc/server/teamplay.qc
Log:
race campaign level: fix qualifying status


Modified: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc	2009-07-19 22:04:44 UTC (rev 7241)
+++ trunk/data/qcsrc/server/teamplay.qc	2009-07-20 04:47:53 UTC (rev 7242)
@@ -331,9 +331,6 @@
 		qualifying_override = cvar("g_race_qualifying_timelimit_override");
 		fraglimit_override = cvar("g_race_laps_limit");
 		leadlimit_override = 0; // currently not supported by race
-
-		if(g_race_qualifying)
-			independent_players = 1;
 	}
 
 	if(g_cts)
@@ -380,8 +377,12 @@
 	if(g_race)
 	{
 		// we need to find out the correct value for g_race_qualifying
-		if(!cvar("g_campaign") && cvar("g_race_qualifying_timelimit") > 0)
+		if(cvar("g_campaign"))
 		{
+			g_race_qualifying = 1;
+		}
+		else if(!cvar("g_campaign") && cvar("g_race_qualifying_timelimit") > 0)
+		{
 			g_race_qualifying = 2;
 			race_fraglimit = cvar("fraglimit");
 			race_leadlimit = cvar("leadlimit");