r4477 - trunk/data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sun Sep 21 08:44:50 EDT 2008


Author: div0
Date: 2008-09-21 08:44:50 -0400 (Sun, 21 Sep 2008)
New Revision: 4477

Modified:
   trunk/data/qcsrc/server/arena.qc
   trunk/data/qcsrc/server/t_items.qc
Log:
properly reset teamed items


Modified: trunk/data/qcsrc/server/arena.qc
===================================================================
--- trunk/data/qcsrc/server/arena.qc	2008-09-21 12:35:38 UTC (rev 4476)
+++ trunk/data/qcsrc/server/arena.qc	2008-09-21 12:44:50 UTC (rev 4477)
@@ -75,8 +75,16 @@
 		}
 		else if(self.flags & FL_ITEM)			// reset items
 		{
-			self.model = self.mdl;
-			self.solid = SOLID_TRIGGER;
+			if(self.cnt == 1)
+			{
+				self.model = string_null;
+				self.solid = SOLID_NOT;
+			}
+			else
+			{
+				self.model = self.mdl;
+				self.solid = SOLID_TRIGGER;
+			}
 			setorigin (self, self.origin);
 			self.think = SUB_Null;
 			self.nextthink = 0;

Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc	2008-09-21 12:35:38 UTC (rev 4476)
+++ trunk/data/qcsrc/server/t_items.qc	2008-09-21 12:44:50 UTC (rev 4477)
@@ -270,6 +270,7 @@
 		for(head = world; (head = findfloat(head, team, self.team)); ) if(head.flags & FL_ITEM)
 			RandomSelection_Add(head, 0, 1, 0);
 		e = RandomSelection_chosen_ent;
+		e.cnt = 0;
 
 		for(head = world; (head = findfloat(head, team, self.team)); ) if(head.flags & FL_ITEM)
 		{
@@ -278,6 +279,7 @@
 				// make it a non-spawned item
 				head.solid = SOLID_NOT;
 				head.model = string_null;
+				head.cnt = 1; // cnt 1 = initially hidden item
 			}
 			head.effects = head.effects - (head.effects & EF_NODRAW);
 		}




More information about the nexuiz-commits mailing list