From 704589eddf8026eb00f9d22a8bb12bc5aa767d63 Mon Sep 17 00:00:00 2001 From: div0 Date: Thu, 6 Dec 2007 09:21:33 +0000 Subject: [PATCH] fix jumppad sound on targetless jumppads git-svn-id: svn://svn.icculus.org/nexuiz/trunk@3000 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/t_jumppads.qc | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/data/qcsrc/server/t_jumppads.qc b/data/qcsrc/server/t_jumppads.qc index beddd5b8e..8fe064277 100644 --- a/data/qcsrc/server/t_jumppads.qc +++ b/data/qcsrc/server/t_jumppads.qc @@ -118,13 +118,6 @@ void() trigger_push_touch = if (other.deadflag && other.classname == "player") return; - if (!self.target) - { - other.velocity = self.movedir; - other.flags = other.flags - (other.flags & FL_ONGROUND); - return; - } - if (other.classname == "player") { if(self.pushltime < time) // prevent "snorring" sound when a player hits the jumppad more than once @@ -152,7 +145,8 @@ void() trigger_push_touch = other.jumppadcount = TRUE; } - self.movedir = trigger_push_calculatevelocity(other.origin, self.enemy, self.height); + if(self.target) + self.movedir = trigger_push_calculatevelocity(other.origin, self.enemy, self.height); other.flags = other.flags - (other.flags & FL_ONGROUND); // reset tracking of oldvelocity for impact damage (sudden velocity changes) -- 2.39.2