From c9444a7256457808f0b416c168b8e30f64e20df3 Mon Sep 17 00:00:00 2001 From: FruitieX Date: Thu, 26 May 2011 13:08:14 +0300 Subject: [PATCH] play the jump animation on jumppads no matter what, except over animation overrides --- qcsrc/server/t_jumppads.qc | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/qcsrc/server/t_jumppads.qc b/qcsrc/server/t_jumppads.qc index b07f04d57..9bea9197d 100644 --- a/qcsrc/server/t_jumppads.qc +++ b/qcsrc/server/t_jumppads.qc @@ -193,15 +193,12 @@ void trigger_push_touch() else other.lastteleporttime = time; - if (other.crouch) + if (!other.animstate_override) { - setanim(other, other.anim_duckjump, FALSE, TRUE, other.restart_jump); - other.restart_jump = FALSE; - } - else - { - setanim(other, other.anim_jump, FALSE, TRUE, other.restart_jump); - other.restart_jump = FALSE; + if (other.crouch) + setanim(other, other.anim_duckjump, TRUE, TRUE, TRUE); + else + setanim(other, other.anim_jump, TRUE, TRUE, TRUE); } } else -- 2.39.2