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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-09-20 06:06:26 -0400 (Sun, 20 Sep 2009)
New Revision: 7845

Modified:
   trunk/data/qcsrc/server/race.qc
Log:
race: do not fully verify CTS maps


Modified: trunk/data/qcsrc/server/race.qc
===================================================================
--- trunk/data/qcsrc/server/race.qc	2009-09-20 09:26:43 UTC (rev 7844)
+++ trunk/data/qcsrc/server/race.qc	2009-09-20 10:06:26 UTC (rev 7845)
@@ -453,34 +453,46 @@
 	self = spawn();
 	self.classname = "player";
 
-	for(i = 0; i <= race_highest_checkpoint; ++i)
+	if(g_race)
 	{
-		self.race_checkpoint = race_NextCheckpoint(i);
+		for(i = 0; i <= race_highest_checkpoint; ++i)
+		{
+			self.race_checkpoint = race_NextCheckpoint(i);
 
-		// race only (middle of the race)
-		g_race_qualifying = 0;
-		self.race_place = 0;
-		if(!Spawn_FilterOutBadSpots(findchain(classname, "info_player_deathmatch"), world, 0, FALSE))
-			error(strcat("Checkpoint ", ftos(i), " misses a spawnpoint with race_place==", ftos(self.race_place), " (used for respawning in race) - bailing out"));
+			// race only (middle of the race)
+			g_race_qualifying = 0;
+			self.race_place = 0;
+			if(!Spawn_FilterOutBadSpots(findchain(classname, "info_player_deathmatch"), world, 0, FALSE))
+				error(strcat("Checkpoint ", ftos(i), " misses a spawnpoint with race_place==", ftos(self.race_place), " (used for respawning in race) - bailing out"));
 
-		if(i == 0)
-		{
-			// qualifying only
-			g_race_qualifying = 1;
-			self.race_place = race_lowest_place_spawn;
-			if(!Spawn_FilterOutBadSpots(findchain(classname, "info_player_deathmatch"), world, 0, FALSE))
-				error(strcat("Checkpoint ", ftos(i), " misses a spawnpoint with race_place==", ftos(self.race_place), " (used for qualifying) - bailing out"));
-			
-			// race only (initial spawn)
-			g_race_qualifying = 0;
-			for(p = 1; p <= race_highest_place_spawn; ++p)
+			if(i == 0)
 			{
-				self.race_place = p;
+				// qualifying only
+				g_race_qualifying = 1;
+				self.race_place = race_lowest_place_spawn;
 				if(!Spawn_FilterOutBadSpots(findchain(classname, "info_player_deathmatch"), world, 0, FALSE))
-					error(strcat("Checkpoint ", ftos(i), " misses a spawnpoint with race_place==", ftos(self.race_place), " (used for initially spawning in race) - bailing out"));
+					error(strcat("Checkpoint ", ftos(i), " misses a spawnpoint with race_place==", ftos(self.race_place), " (used for qualifying) - bailing out"));
+				
+				// race only (initial spawn)
+				g_race_qualifying = 0;
+				for(p = 1; p <= race_highest_place_spawn; ++p)
+				{
+					self.race_place = p;
+					if(!Spawn_FilterOutBadSpots(findchain(classname, "info_player_deathmatch"), world, 0, FALSE))
+						error(strcat("Checkpoint ", ftos(i), " misses a spawnpoint with race_place==", ftos(self.race_place), " (used for initially spawning in race) - bailing out"));
+				}
 			}
 		}
 	}
+	else
+	{
+		// qualifying only
+		self.race_checkpoint = race_NextCheckpoint(0);
+		g_race_qualifying = 1;
+		self.race_place = race_lowest_place_spawn;
+		if(!Spawn_FilterOutBadSpots(findchain(classname, "info_player_deathmatch"), world, 0, FALSE))
+			error(strcat("Checkpoint ", ftos(i), " misses a spawnpoint with race_place==", ftos(self.race_place), " (used for qualifying) - bailing out"));
+	}
 
 	g_race_qualifying = qual;