]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Don't spam body impact sound if monster is burning
authorMario <mario@smbclan.net>
Thu, 12 Jan 2017 17:07:47 +0000 (03:07 +1000)
committerMario <mario@smbclan.net>
Thu, 12 Jan 2017 17:07:47 +0000 (03:07 +1000)
qcsrc/common/monsters/sv_monsters.qc

index 1f8f50790f2987c3adce69e1c609c58e36832585..fcab35af5334e5e282dc9013e0e12d0ca28d3586 100644 (file)
@@ -1073,7 +1073,7 @@ void Monster_Damage(entity this, entity inflictor, entity attacker, float damage
 
        this.dmg_time = time;
 
 
        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;
                spamsound (this, CH_PAIN, SND(BODYIMPACT1), VOL_BASE, ATTEN_NORM);  // FIXME: PLACEHOLDER
 
        this.velocity += force * this.damageforcescale;