r4159 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-08-23 09:52:13 -0400 (Sat, 23 Aug 2008)
New Revision: 4159

Modified:
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
avoid the recursion for a trivial case in ExactTrigger


Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2008-08-23 13:39:04 UTC (rev 4158)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2008-08-23 13:52:13 UTC (rev 4159)
@@ -1153,7 +1153,7 @@
 	entity se;
 	float f;
 
-	tracebox('0 0 0', ExactTriggerHit_mins, ExactTriggerHit_maxs, '0 0 0', MOVE_NORMAL, world);
+	tracebox('0 0 0', ExactTriggerHit_mins, ExactTriggerHit_maxs, '0 0 0', MOVE_NORMAL, other);
 	if not(trace_ent)
 		return 0;
 	if(trace_ent == self)
@@ -1187,4 +1187,4 @@
 
 // WARNING: this kills the trace globals
 #define EXACTTRIGGER_TOUCH if not(ExactTriggerHit()) return
-#define EXACTTRIGGER_INIT  InitSolidBSPTrigger(); self.solid = SOLID_BSP
+#define EXACTTRIGGER_INIT  InitSolidBSPTrigger(); self.solid = SOLID_TRIGGER