jump animation should not override melee anim until we have animation blending

diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc
index e986341cd027eb11b5904f5542d5ab833e8a2ea9..63b12ffb57e1a2a5bd79c803329b3319add83203 100644 (file)
--- 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)