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

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Tue May 12 07:14:58 EDT 2009


Author: div0
Date: 2009-05-12 07:14:58 -0400 (Tue, 12 May 2009)
New Revision: 6714

Modified:
   trunk/data/qcsrc/server/t_items.qc
Log:
fix respawn display of teamed items


Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc	2009-05-12 10:49:43 UTC (rev 6713)
+++ trunk/data/qcsrc/server/t_items.qc	2009-05-12 11:14:58 UTC (rev 6714)
@@ -51,7 +51,6 @@
 {
 	if(self.count >= 5)
 	{
-		self.count = 0;
 		if(self.waypointsprite_attached)
 			WaypointSprite_Kill(self.waypointsprite_attached);
 		Item_Respawn();
@@ -89,7 +88,7 @@
 			}
 			if(name)
 			{
-				WaypointSprite_Attach(name, FALSE);
+				WaypointSprite_Spawn(name, 0, 0, self, '0 0 64', world, 0, self, waypointsprite_attached, FALSE);
 				if(self.waypointsprite_attached)
 					WaypointSprite_UpdateTeamRadar(self.waypointsprite_attached, RADARICON_POWERUP, rgb);
 			}
@@ -106,6 +105,7 @@
 	{
 		e.think = Item_RespawnCountdown;
 		e.nextthink = time + ITEM_RESPAWNTIME(e) - 5;
+		e.count = 0;
 	}
 	else
 	{
@@ -374,14 +374,14 @@
 				head.model = string_null;
 				head.state = 1; // state 1 = initially hidden item
 			}
-			head.effects = head.effects - (head.effects & EF_NODRAW);
+			head.effects &~= EF_NODRAW;
 		}
 
-		if(head.flags & FL_POWERUP) // do not spawn powerups initially!
+		if(e.flags & FL_POWERUP) // do not spawn powerups initially!
 		{
-			head.solid = SOLID_NOT;
-			head.model = string_null;
-			Item_ScheduleRespawn(head);
+			e.solid = SOLID_NOT;
+			e.model = string_null;
+			Item_ScheduleRespawn(e);
 		}
 	}
 }



More information about the nexuiz-commits mailing list