From: FruitieX <fruitiex@gmail.com>
Date: Thu, 26 May 2011 10:08:14 +0000 (+0300)
Subject: play the jump animation on jumppads no matter what, except over animation overrides
X-Git-Tag: xonotic-v0.6.0~40^2~76^2~16
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c9444a7256457808f0b416c168b8e30f64e20df3;p=xonotic%2Fxonotic-data.pk3dir.git

play the jump animation on jumppads no matter what, except over animation overrides
---

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