r3242 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-01-23 13:14:32 -0500 (Wed, 23 Jan 2008)
New Revision: 3242

Modified:
   trunk/data/qcsrc/server/cl_client.qc
Log:
if spawnpoints fail in initial state, error out again


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2008-01-23 16:58:08 UTC (rev 3241)
+++ trunk/data/qcsrc/server/cl_client.qc	2008-01-23 18:14:32 UTC (rev 3242)
@@ -14,10 +14,14 @@
 	relocate_spawnpoint();
 }
 
+float some_spawn_has_been_used;
 void() spawnpoint_use =
 {
 	if(teams_matter)
+	{
 		self.team = activator.team;
+		some_spawn_has_been_used = 1;
+	}
 };
 
 float spawn_allbad;
@@ -181,7 +185,12 @@
 		if(cvar("spawn_debug"))
 			GotoNextMap();
 		else
-			return world;
+		{
+			if(some_spawn_has_been_used)
+				return world; // team can't spawn any more, because of actions of other team
+			else
+				error("Cannot find a spawn point - please fix the map!");
+		}
 	}
 
 	return spot;