From: Mario <mario.mario@y7mail.com>
Date: Tue, 22 Sep 2020 14:14:30 +0000 (+1000)
Subject: Exclude burning and buff damage types from damage text, fixes #2490
X-Git-Tag: xonotic-v0.8.5~759
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=39c6729172a1ab467162c9ae5a66445d19aac9be;p=xonotic%2Fxonotic-data.pk3dir.git

Exclude burning and buff damage types from damage text, fixes #2490
---

diff --git a/qcsrc/common/mutators/mutator/damagetext/sv_damagetext.qc b/qcsrc/common/mutators/mutator/damagetext/sv_damagetext.qc
index 0e0aa13fd..38d28a449 100644
--- a/qcsrc/common/mutators/mutator/damagetext/sv_damagetext.qc
+++ b/qcsrc/common/mutators/mutator/damagetext/sv_damagetext.qc
@@ -17,6 +17,7 @@ MUTATOR_HOOKFUNCTION(damagetext, PlayerDamaged) {
     int deathtype = M_ARGV(5, int);
     float potential_damage = M_ARGV(6, float);
     if(DEATH_WEAPONOF(deathtype) == WEP_VAPORIZER) return;
+    if(deathtype == DEATH_FIRE.m_id || deathtype == DEATH_BUFF.m_id) return; // TODO: exclude damage over time and thorn effects
     FOREACH_CLIENT(IS_REAL_CLIENT(it), {
         if (
             (SV_DAMAGETEXT_ALL()) ||