From 65eb536fe3c8679e40367b229825adb97df13cdd Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Fri, 10 Oct 2008 16:12:42 +0000
Subject: [PATCH] fix keyhunt crash with warmup

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4717 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/server/arena.qc | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/data/qcsrc/server/arena.qc b/data/qcsrc/server/arena.qc
index 513b3f028..972f4475d 100644
--- a/data/qcsrc/server/arena.qc
+++ b/data/qcsrc/server/arena.qc
@@ -64,11 +64,6 @@ void reset_map()
 				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 @@ void reset_map()
 		}
 	}
 
+	// 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) {
-- 
2.39.2