From f0a3c291353f1047c8ba43e0045bba35cc82aa11 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 12 Dec 2014 15:34:55 +1100 Subject: [PATCH] Partial fix for multijump --- qcsrc/common/physics.qh | 2 +- qcsrc/server/mutators/mutator_multijump.qc | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/qcsrc/common/physics.qh b/qcsrc/common/physics.qh index 0afd9aedd..0691e7a29 100644 --- a/qcsrc/common/physics.qh +++ b/qcsrc/common/physics.qh @@ -118,7 +118,7 @@ #define SET_DUCKED(s) s.crouch = TRUE #define UNSET_DUCKED(s) s.crouch = FALSE - #define IS_JUMP_HELD(s) (s.flags & FL_JUMPRELEASED == 0) + #define IS_JUMP_HELD(s) !(s.flags & FL_JUMPRELEASED) #define SET_JUMP_HELD(s) s.flags &= ~FL_JUMPRELEASED #define UNSET_JUMP_HELD(s) s.flags |= FL_JUMPRELEASED diff --git a/qcsrc/server/mutators/mutator_multijump.qc b/qcsrc/server/mutators/mutator_multijump.qc index 92d4ef7a2..439552f25 100644 --- a/qcsrc/server/mutators/mutator_multijump.qc +++ b/qcsrc/server/mutators/mutator_multijump.qc @@ -64,7 +64,7 @@ float PM_multijump_checkjump() if(!PHYS_MOVE_MULTIJUMP && self.multijump_ready && self.multijump_count < PHYS_MULTIJUMP && self.velocity_z > PHYS_MULTIJUMP_SPEED) { - if (PHYS_MOVE_MULTIJUMP) + if (PHYS_MULTIJUMP) { if (!PHYS_MULTIJUMP_ADD) // in this case we make the z velocity == jumpvelocity { @@ -84,10 +84,6 @@ float PM_multijump_checkjump() float curspeed = vlen(vec2(self.velocity)); vector wishvel, wishdir; - /*curspeed = max( - vlen(vec2(self.velocity)), // current xy speed - vlen(vec2(antilag_takebackavgvelocity(self, max(self.lastteleporttime + sys_frametime, time - 0.25), time))) // average xy topspeed over the last 0.25 secs - );*/ makevectors(PHYS_INPUT_ANGLES(self)_y * '0 1 0'); wishvel = v_forward * PHYS_INPUT_MOVEVALUES(self)_x + v_right * PHYS_INPUT_MOVEVALUES(self)_y; wishdir = normalize(wishvel); -- 2.39.2