From 642be474f645ae9405417eaf02524ee2226b2fbc Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Thu, 22 Jan 2009 12:59:43 +0000
Subject: [PATCH] make WPs self-resetting

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@5635 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/server/arena.qc           | 6 ------
 data/qcsrc/server/waypointsprites.qc | 9 +++++++++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/data/qcsrc/server/arena.qc b/data/qcsrc/server/arena.qc
index da222e938..5e3702ff5 100644
--- a/data/qcsrc/server/arena.qc
+++ b/data/qcsrc/server/arena.qc
@@ -66,12 +66,6 @@ void reset_map(float norespawn)
 			self.reset2();
 			continue;
 		}
-
-		if(self.classname == "sprite_waypoint")
-		{
-			if(self.health || g_keyhunt) // TODO remove this KH workaround somehow
-				WaypointSprite_Kill(self);
-		}
 	}
 
 	// Moving the player reset code here since the player-reset depends
diff --git a/data/qcsrc/server/waypointsprites.qc b/data/qcsrc/server/waypointsprites.qc
index 897164239..82b6891ef 100644
--- a/data/qcsrc/server/waypointsprites.qc
+++ b/data/qcsrc/server/waypointsprites.qc
@@ -213,6 +213,14 @@ float WaypointSprite_SendEntity(entity to, float sendflags)
 	return TRUE;
 }
 
+void WaypointSprite_Reset()
+{
+	// if a WP wants to time out, let it time out immediately; other WPs ought to be reset/killed by their owners
+
+	if(self.health) // there was there before: || g_keyhunt, do we really need this?
+		WaypointSprite_Kill(self);
+}
+
 entity WaypointSprite_Spawn(
 	string spr, // sprite
 	float lifetime, float maxdistance, // lifetime, max distance
@@ -252,6 +260,7 @@ entity WaypointSprite_Spawn(
 	wp.SendEntity = WaypointSprite_SendEntity;
 	wp.customizeentityforclient = WaypointSprite_Customize;
 	wp.waypointsprite_visible_for_player = WaypointSprite_visible_for_player;
+	wp.reset2 = WaypointSprite_Reset;
 	return wp;
 }
 
-- 
2.39.2