From bbc8bd0f160f2ee1afaded2518b5f66e73e5101b Mon Sep 17 00:00:00 2001 From: div0 Date: Thu, 3 Sep 2009 20:03:07 +0000 Subject: [PATCH] trigger_impulse: make it sane again (strength 1 = identity, <1 = slow down, >1 = speedup, the value is the speed change factor PER SECOND) git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7615 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/g_triggers.qc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/data/qcsrc/server/g_triggers.qc b/data/qcsrc/server/g_triggers.qc index 372826c3c..46542b751 100644 --- a/data/qcsrc/server/g_triggers.qc +++ b/data/qcsrc/server/g_triggers.qc @@ -1173,11 +1173,8 @@ void trigger_impulse_touch2() other.lastpushtime = time; if(!pushdeltatime) return; - // LordHavoc: rewrote this velocity math (was * self.strength * pushdeltatime) to make it less ticrate dependent - //if(self.strength > 1) - other.velocity = other.velocity * (1 + (self.strength - 20) * pushdeltatime); - //else - // other.velocity = other.velocity - (other.velocity * self.strength * pushdeltatime); + // div0: ticrate independent, 1 = identity (not 20) + other.velocity = other.velocity * pow(self.strength, * pushdeltatime); } // Spherical (gravity/repulsor) mode -- 2.39.2