r3136 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-01-13 06:18:11 -0500 (Sun, 13 Jan 2008)
New Revision: 3136

Modified:
   trunk/data/qcsrc/server/defs.qh
   trunk/data/qcsrc/server/g_triggers.qc
   trunk/data/qcsrc/server/t_items.qc
Log:
tZork's trigger changes (trigger_delay, trigger_multiple.team);
kill entities with "notq3a" "1" (we aren't Q3A, but we aren't TA either, so let's kill all TA-only entities by that and only show the Q3A ones)


Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh	2008-01-13 11:07:06 UTC (rev 3135)
+++ trunk/data/qcsrc/server/defs.qh	2008-01-13 11:18:11 UTC (rev 3136)
@@ -379,3 +379,4 @@
 .float notteam;
 .float notsingle;
 .float notfree;
+.float notq3a;

Modified: trunk/data/qcsrc/server/g_triggers.qc
===================================================================
--- trunk/data/qcsrc/server/g_triggers.qc	2008-01-13 11:07:06 UTC (rev 3135)
+++ trunk/data/qcsrc/server/g_triggers.qc	2008-01-13 11:18:11 UTC (rev 3136)
@@ -181,6 +181,10 @@
 	if (other.classname != "player")
 		return;
 
+    if(self.team)
+    if(self.team == other.team)
+        return;
+
 // if the trigger has an angles field, check player's facing direction
 	if (self.movedir != '0 0 0')
 	{
@@ -291,7 +295,20 @@
 	self.use = SUB_UseTargets;
 };
 
+void() delay_use
+{
+    self.think = SUB_UseTargets;
+    self.nextthink = self.wait;
+}
 
+void() trigger_delay
+{
+    if(!self.wait)
+        self.wait = 1;
+
+    self.use = delay_use;
+}
+
 //=============================================================================
 
 

Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc	2008-01-13 11:07:06 UTC (rev 3135)
+++ trunk/data/qcsrc/server/t_items.qc	2008-01-13 11:18:11 UTC (rev 3136)
@@ -305,6 +305,15 @@
 			}
 		}
 
+		if(self.notq3a)
+		{
+			// We aren't TA or something like that, so we keep the Q3A entities
+			print("removed non-Q3A ", self.classname, "\n");
+			startitem_failed = TRUE;
+			remove (self);
+			return;
+		}
+		
 		if(self.targetname)
 		{
 			// target_give not yet supported; maybe later