From: FruitieX <fruitiex@gmail.com>
Date: Thu, 26 May 2011 00:19:53 +0000 (+0300)
Subject: jump animation should not override melee anim until we have animation blending
X-Git-Tag: xonotic-v0.6.0~40^2~76^2~21
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d74a5ec398a8e1a1e80d1f82a08f35f69724de5f;p=xonotic%2Fxonotic-data.pk3dir.git

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 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)