From: FruitieX <fruitiex@gmail.com>
Date: Thu, 26 May 2011 01:02:54 +0000 (+0300)
Subject: don't get stuck on idle anim in midair
X-Git-Tag: xonotic-v0.6.0~40^2~76^2~19
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8a780b18f13deb112d9fc60d78b8e48e6cb067a5;p=xonotic%2Fxonotic-data.pk3dir.git

don't get stuck on idle anim in midair
---

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 2f46fc1a2..8819ba765 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -262,7 +262,7 @@ void player_anim (void)
 			if (self.crouch)
 			{
 				traceline(self.origin + '0 0 1' * PL_CROUCH_MIN_z, self.origin + '0 0 1' * (PL_CROUCH_MIN_z - autocvar_sv_player_jumpanim_minfall), TRUE, self);
-				if(!trace_startsolid && trace_fraction == 1)
+				if(!trace_startsolid && trace_fraction == 1 || self.animstate_startframe == 7) // don't get stuck on idle animation in midair
 				{
 					setanim(self, self.anim_duckjump, FALSE, TRUE, self.restart_jump);
 					self.restart_jump = FALSE;
@@ -271,7 +271,7 @@ void player_anim (void)
 			else
 			{
 				traceline(self.origin + '0 0 1' * PL_MIN_z, self.origin + '0 0 1' * (PL_MIN_z - autocvar_sv_player_jumpanim_minfall), TRUE, self);
-				if(!trace_startsolid && trace_fraction == 1)
+				if(!trace_startsolid && trace_fraction == 1 || self.animstate_startframe == 7) // don't get stuck on idle animation in midair
 				{
 					setanim(self, self.anim_jump, FALSE, TRUE, self.restart_jump);
 					self.restart_jump = FALSE;