r1789 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2006-07-28 09:46:02 -0400 (Fri, 28 Jul 2006)
New Revision: 1789

Modified:
   trunk/data/qcsrc/server/defs.qh
   trunk/data/qcsrc/server/t_items.qc
Log:
damn, forgot to add these


Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh	2006-07-28 13:44:52 UTC (rev 1788)
+++ trunk/data/qcsrc/server/defs.qh	2006-07-28 13:46:02 UTC (rev 1789)
@@ -270,3 +270,5 @@
 
 string gamemode_name;
 float teams_matter;
+
+float startitem_failed;

Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc	2006-07-28 13:44:52 UTC (rev 1788)
+++ trunk/data/qcsrc/server/t_items.qc	2006-07-28 13:46:02 UTC (rev 1789)
@@ -231,6 +231,8 @@
 	vector org;
 	org = self.origin;
 
+	startitem_failed = FALSE;
+
 	if (self.classname != "droppedweapon" && !self.noalign)
 	{
 		vector z_offset;
@@ -258,6 +260,7 @@
 	if (!(cvar("g_pickup_items") && !cvar("g_nixnex")) && !cvar("g_minstagib") &&
 			itemid != IT_STRENGTH && itemid != IT_INVINCIBLE && itemid != IT_HEALTH)
 	{
+		startitem_failed = TRUE;
 		remove (self);
 		return;
 	}
@@ -268,6 +271,7 @@
 		if (self.classname != "droppedweapon" &&
 		    self.classname != "minstagib")
 		{
+			startitem_failed = TRUE;
 			remove (self);
 			return;
 		}
@@ -275,12 +279,14 @@
 
 	if(cvar("g_lms") && (self.classname != "droppedweapon"))
 	{
+		startitem_failed = TRUE;
 		remove(self);
 		return;
 	}
 
 	if(cvar("g_instagib") || cvar("g_rocketarena"))
 	{
+		startitem_failed = TRUE;
 		remove(self);
 		return;
 	}
@@ -291,6 +297,7 @@
 		traceline(self.origin, self.origin, MOVE_NORMAL, self);
 		if (trace_dpstartcontents & DPCONTENTS_NODROP)
 		{
+			startitem_failed = TRUE;
 			remove(self);
 			return;
 		}