From: FruitieX <fruitiex@gmail.com>
Date: Wed, 25 May 2011 23:46:39 +0000 (+0300)
Subject: fix pain animation overriding melee anim
X-Git-Tag: xonotic-v0.6.0~40^2~76^2~24
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3751c1efa19868cc3edaded79cc485d4d895528b;p=xonotic%2Fxonotic-data.pk3dir.git

fix pain animation overriding melee anim
---

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 04ce7c0d3..4de169221 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -486,10 +486,13 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 				if(sv_gentle < 1) {
 					if(self.classname != "body") // pain anim is BORKED on our ZYMs, FIXME remove this once we have good models
 					{
-						if (random() > 0.5)
-							setanim(self, self.anim_pain1, FALSE, TRUE, TRUE);
-						else
-							setanim(self, self.anim_pain2, FALSE, TRUE, TRUE);
+						if (!self.animstate_override)
+						{
+							if (random() > 0.5)
+								setanim(self, self.anim_pain1, FALSE, TRUE, TRUE);
+							else
+								setanim(self, self.anim_pain2, FALSE, TRUE, TRUE);
+						}
 					}
 
 					if(sound_allowed(MSG_BROADCAST, attacker))