From 7ca26d590ec8dd727a027e3e1166d30b595460db Mon Sep 17 00:00:00 2001 From: div0 Date: Sat, 23 Aug 2008 13:39:04 +0000 Subject: [PATCH] make trigger_swamp exact too. InitTrigger() is no longer used. git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4158 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/g_triggers.qc | 2 +- data/qcsrc/server/miscfunctions.qc | 2 +- data/qcsrc/server/t_swamp.qc | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/data/qcsrc/server/g_triggers.qc b/data/qcsrc/server/g_triggers.qc index 1df51c328..39e561c01 100644 --- a/data/qcsrc/server/g_triggers.qc +++ b/data/qcsrc/server/g_triggers.qc @@ -393,7 +393,7 @@ entity trigger_hurt_last; entity trigger_hurt_first; void spawnfunc_trigger_hurt() { - InitTrigger (); + EXACTTRIGGER_INIT; self.touch = trigger_hurt_touch; if (!self.dmg) self.dmg = 1000; diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc index 448fc567f..fdb79da43 100644 --- a/data/qcsrc/server/miscfunctions.qc +++ b/data/qcsrc/server/miscfunctions.qc @@ -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_TRIGGER +#define EXACTTRIGGER_INIT InitSolidBSPTrigger(); self.solid = SOLID_BSP diff --git a/data/qcsrc/server/t_swamp.qc b/data/qcsrc/server/t_swamp.qc index d9d6ea419..9a24e3b77 100644 --- a/data/qcsrc/server/t_swamp.qc +++ b/data/qcsrc/server/t_swamp.qc @@ -57,6 +57,8 @@ void swamp_touch(void) 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 @@ get slowd down and damaged void spawnfunc_trigger_swamp(void) { // Init stuff - InitTrigger (); + EXACTTRIGGER_INIT; self.touch = swamp_touch; // Setup default keys, if missing -- 2.39.2