From: Mario <mario@smbclan.net>
Date: Thu, 12 Jan 2017 17:07:47 +0000 (+1000)
Subject: Don't spam body impact sound if monster is burning
X-Git-Tag: xonotic-v0.8.2~295
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=75cc3b0a65b02ee61f525e6c6d788ab591868e42;p=xonotic%2Fxonotic-data.pk3dir.git

Don't spam body impact sound if monster is burning
---

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 1f8f50790..fcab35af5 100644
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -1073,7 +1073,7 @@ void Monster_Damage(entity this, entity inflictor, entity attacker, float damage
 
 	this.dmg_time = time;
 
-	if(sound_allowed(MSG_BROADCAST, attacker) && deathtype != DEATH_DROWN.m_id)
+	if(sound_allowed(MSG_BROADCAST, attacker) && deathtype != DEATH_DROWN.m_id && deathtype != DEATH_FIRE.m_id)
 		spamsound (this, CH_PAIN, SND(BODYIMPACT1), VOL_BASE, ATTEN_NORM);  // FIXME: PLACEHOLDER
 
 	this.velocity += force * this.damageforcescale;