r4717 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-10-10 12:12:42 -0400 (Fri, 10 Oct 2008)
New Revision: 4717

Modified:
   trunk/data/qcsrc/server/arena.qc
Log:
fix keyhunt crash with warmup


Modified: trunk/data/qcsrc/server/arena.qc
===================================================================
--- trunk/data/qcsrc/server/arena.qc	2008-10-10 15:55:56 UTC (rev 4716)
+++ trunk/data/qcsrc/server/arena.qc	2008-10-10 16:12:42 UTC (rev 4717)
@@ -64,11 +64,6 @@
 				DropAllRunes(self.owner);
 			rune_respawn();
 		}
-		else if(self.classname == "sprite_waypoint")
-		{
-			if(self.health | g_keyhunt)
-				WaypointSprite_Kill(self);
-		}
 		else if(self.classname == "dom_controlpoint")
 		{
 			dom_controlpoint_setup();
@@ -114,6 +109,14 @@
 		}
 	}
 
+	// Waypoints come LAST (keyhunt keys reference them)
+	for(self = world; (self = nextent(self)); )
+		if(self.classname == "sprite_waypoint")
+		{
+			if(self.health | g_keyhunt)
+				WaypointSprite_Kill(self);
+		}
+
 	// Moving the player reset code here since the player-reset depends
 	// on spawnpoint entities which have to be reset first --blub
 	FOR_EACH_CLIENT(self) {