From d74a5ec398a8e1a1e80d1f82a08f35f69724de5f Mon Sep 17 00:00:00 2001 From: FruitieX Date: Thu, 26 May 2011 03:19:53 +0300 Subject: [PATCH] jump animation should not override melee anim until we have animation blending --- qcsrc/server/cl_physics.qc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc index e986341cd..63b12ffb5 100644 --- a/qcsrc/server/cl_physics.qc +++ b/qcsrc/server/cl_physics.qc @@ -163,7 +163,7 @@ void PlayerJump (void) if (self.crouch) setanim(self, self.anim_duckjump, FALSE, TRUE, TRUE); - else + else if (self.animstate_startframe != 23) // jump animation shouldn't override melee until we have animation blending setanim(self, self.anim_jump, FALSE, TRUE, TRUE); if(g_jump_grunt) -- 2.39.2