r4158 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-08-23 09:39:04 -0400 (Sat, 23 Aug 2008)
New Revision: 4158

Modified:
   trunk/data/qcsrc/server/g_triggers.qc
   trunk/data/qcsrc/server/miscfunctions.qc
   trunk/data/qcsrc/server/t_swamp.qc
Log:
make trigger_swamp exact too. InitTrigger() is no longer used.


Modified: trunk/data/qcsrc/server/g_triggers.qc
===================================================================
--- trunk/data/qcsrc/server/g_triggers.qc	2008-08-23 12:33:02 UTC (rev 4157)
+++ trunk/data/qcsrc/server/g_triggers.qc	2008-08-23 13:39:04 UTC (rev 4158)
@@ -393,7 +393,7 @@
 entity trigger_hurt_first;
 void spawnfunc_trigger_hurt()
 {
-	InitTrigger ();
+	EXACTTRIGGER_INIT;
 	self.touch = trigger_hurt_touch;
 	if (!self.dmg)
 		self.dmg = 1000;

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2008-08-23 12:33:02 UTC (rev 4157)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2008-08-23 13:39:04 UTC (rev 4158)
@@ -1187,4 +1187,4 @@
 
 // WARNING: this kills the trace globals
 #define EXACTTRIGGER_TOUCH if not(ExactTriggerHit()) return
-#define EXACTTRIGGER_INIT  InitSolidBSPTrigger(); self.solid = SOLID_TRIGGER
+#define EXACTTRIGGER_INIT  InitSolidBSPTrigger(); self.solid = SOLID_BSP

Modified: trunk/data/qcsrc/server/t_swamp.qc
===================================================================
--- trunk/data/qcsrc/server/t_swamp.qc	2008-08-23 12:33:02 UTC (rev 4157)
+++ trunk/data/qcsrc/server/t_swamp.qc	2008-08-23 13:39:04 UTC (rev 4158)
@@ -57,6 +57,8 @@
 	if((other.classname != "player")||(other.deadflag != DEAD_NO))
 		return;
 
+	EXACTTRIGGER_TOUCH;
+
 	// Chech if player alredy got a swampslug.
 	if(other.in_swamp != 1) {
 		// If not attach one.
@@ -86,7 +88,7 @@
 void spawnfunc_trigger_swamp(void)
 {
 	// Init stuff
-	InitTrigger ();
+	EXACTTRIGGER_INIT;
 	self.touch = swamp_touch;	
 
 	// Setup default keys, if missing