From c24ca24cc067994042840e017c510a1944320f5c Mon Sep 17 00:00:00 2001 From: div0 Date: Sat, 23 Aug 2008 13:52:13 +0000 Subject: [PATCH] avoid the recursion for a trivial case in ExactTrigger git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4159 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/miscfunctions.qc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc index fdb79da43..9a7afa84b 100644 --- a/data/qcsrc/server/miscfunctions.qc +++ b/data/qcsrc/server/miscfunctions.qc @@ -1153,7 +1153,7 @@ float ExactTriggerHit_Recurse() 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 @@ float ExactTriggerHit() // 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 -- 2.39.2