[nexuiz-commits] r7087 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-06-23 15:41:19 -0400 (Tue, 23 Jun 2009)
New Revision: 7087

Modified:
   trunk/data/qcsrc/server/waypointsprites.qc
Log:
rename a field in waypointsprites


Modified: trunk/data/qcsrc/server/waypointsprites.qc
===================================================================
--- trunk/data/qcsrc/server/waypointsprites.qc	2009-06-23 19:41:18 UTC (rev 7086)
+++ trunk/data/qcsrc/server/waypointsprites.qc	2009-06-23 19:41:19 UTC (rev 7087)
@@ -59,21 +59,21 @@
 
 void WaypointSprite_FadeOutIn(entity e, float t)
 {
-	if(!e.health)
+	if(!e.fade_time)
 	{
-		e.health = t;
+		e.fade_time = t;
 		e.teleport_time = time + t;
 	}
 	else if(t < (e.teleport_time - time))
 	{
 		// accelerate the waypoint's dying
 		// ensure:
-		//   (e.teleport_time - time) / wp.health stays
+		//   (e.teleport_time - time) / wp.fade_time stays
 		//   e.teleport_time = time + fadetime
 		float current_fadetime;
 		current_fadetime = e.teleport_time - time;
 		e.teleport_time = time + t;
-		e.health = e.health * t / current_fadetime;
+		e.fade_time = e.fade_time * t / current_fadetime;
 	}
 
 	e.SendFlags |= 16;
@@ -125,7 +125,7 @@
 
 	doremove = FALSE;
 
-	if(self.health)
+	if(self.fade_time)
 	{
 		if(time >= self.teleport_time)
 			doremove = TRUE;
@@ -201,7 +201,7 @@
 
 	if(sendflags & 16)
 	{
-		WriteCoord(MSG_ENTITY, self.health);
+		WriteCoord(MSG_ENTITY, self.fade_time);
 		WriteCoord(MSG_ENTITY, self.teleport_time);
 		WriteShort(MSG_ENTITY, self.max_health); // maxdist
 		float f;
@@ -228,7 +228,7 @@
 {
 	// 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?
+	if(self.fade_time) // there was there before: || g_keyhunt, do we really need this?
 		WaypointSprite_Kill(self);
 }
 
@@ -245,7 +245,7 @@
 	wp = spawn();
 	wp.classname = "sprite_waypoint";
 	wp.teleport_time = time + lifetime;
-	wp.health = lifetime;
+	wp.fade_time = lifetime;
 	wp.exteriormodeltoclient = ref;
 	if(ref)
 	{