From: Mircea Kitsune Date: Mon, 3 May 2010 00:25:17 +0000 (+0300) Subject: Remove broken code from a failed attempt to detect "untouching" X-Git-Tag: xonotic-v0.1.0preview~640^2~11^2~15 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=477708f4df86a4362832697cc40465e79120c04a;p=xonotic%2Fxonotic-data.pk3dir.git Remove broken code from a failed attempt to detect "untouching" --- diff --git a/qcsrc/server/g_triggers.qc b/qcsrc/server/g_triggers.qc index a42e8fda8..fdcd0ad3e 100644 --- a/qcsrc/server/g_triggers.qc +++ b/qcsrc/server/g_triggers.qc @@ -534,23 +534,15 @@ void spawnfunc_trigger_heal() ////////////////////////////////////////////////////////////// .float triggergravitytime; -void trigger_gravity_think() -{ - dprint("XXXXXXXXXXXXXXXXXXXXXXXXXX "); - self.toucher.gravity = 0; - self.toucher = world; - self.nextthink = 0; -} - void trigger_gravity_touch() { if(sv_gravity != 800) return; // only do the EXACTTRIGGER_TOUCH checks when really needed (saves some cpu) - if (self.triggergravitytime < time) + if (other.triggergravitytime < time) { EXACTTRIGGER_TOUCH; - self.triggergravitytime = time + 1; + other.triggergravitytime = time + 1; if (other.gravity != self.gravity) {