r5635 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-01-22 07:59:43 -0500 (Thu, 22 Jan 2009)
New Revision: 5635

Modified:
   trunk/data/qcsrc/server/arena.qc
   trunk/data/qcsrc/server/waypointsprites.qc
Log:
make WPs self-resetting


Modified: trunk/data/qcsrc/server/arena.qc
===================================================================
--- trunk/data/qcsrc/server/arena.qc	2009-01-22 12:54:13 UTC (rev 5634)
+++ trunk/data/qcsrc/server/arena.qc	2009-01-22 12:59:43 UTC (rev 5635)
@@ -66,12 +66,6 @@
 			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

Modified: trunk/data/qcsrc/server/waypointsprites.qc
===================================================================
--- trunk/data/qcsrc/server/waypointsprites.qc	2009-01-22 12:54:13 UTC (rev 5634)
+++ trunk/data/qcsrc/server/waypointsprites.qc	2009-01-22 12:59:43 UTC (rev 5635)
@@ -213,6 +213,14 @@
 	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 @@
 	wp.SendEntity = WaypointSprite_SendEntity;
 	wp.customizeentityforclient = WaypointSprite_Customize;
 	wp.waypointsprite_visible_for_player = WaypointSprite_visible_for_player;
+	wp.reset2 = WaypointSprite_Reset;
 	return wp;
 }