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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-12-11 09:23:47 -0500 (Fri, 11 Dec 2009)
New Revision: 8384

Modified:
   trunk/data/qcsrc/server/g_triggers.qc
Log:
trigger_multiple: do not wait if "wait" is -2


Modified: trunk/data/qcsrc/server/g_triggers.qc
===================================================================
--- trunk/data/qcsrc/server/g_triggers.qc	2009-12-10 17:22:24 UTC (rev 8383)
+++ trunk/data/qcsrc/server/g_triggers.qc	2009-12-11 14:23:47 UTC (rev 8384)
@@ -165,6 +165,10 @@
 		self.think = multi_wait;
 		self.nextthink = time + self.wait;
 	}
+	else if (self.wait == 0)
+	{
+		multi_wait(); // waiting finished
+	}
 	else
 	{	// we can't just remove (self) here, because this is a touch function
 		// called wheil C code is looping through area links...
@@ -270,6 +274,8 @@
 
 	if (!self.wait)
 		self.wait = 0.2;
+	else if(self.wait < -1)
+		self.wait = 0;
 	self.use = multi_use;
 
 	EXACTTRIGGER_INIT;