DamageText code quality changes and new DT lifetime and accumulation lifetime cvars

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / damagetext / sv_damagetext.qc

diff --git a/qcsrc/common/mutators/mutator/damagetext/sv_damagetext.qc b/qcsrc/common/mutators/mutator/damagetext/sv_damagetext.qc
index 8bf9516809e474e62cddb99cf72cacf83807d28f..c244d170d259709ea485cc874e0a707e0c1294dc 100644 (file)
--- a/qcsrc/common/mutators/mutator/damagetext/sv_damagetext.qc
+++ b/qcsrc/common/mutators/mutator/damagetext/sv_damagetext.qc
@@ -17,72 +17,72 @@ REGISTER_MUTATOR(damagetext, true);
 
 bool write_damagetext(entity this, entity client, int sf)
 {
-    entity attacker = this.realowner;
-    entity hit = this.enemy;
-    int flags = this.dent_net_flags;
-    int deathtype = this.dent_net_deathtype;
-    float health = this.dent_net_health;
-    float armor = this.dent_net_armor;
-    float potential_damage = this.dent_net_potential;
-    if (!(
-        (SV_DAMAGETEXT_ALL()) ||
-        (SV_DAMAGETEXT_PLAYERS() && client == attacker) ||
-        (SV_DAMAGETEXT_SPECTATORS_ONLY() && IS_SPEC(client) && client.enemy == attacker) ||
-        (SV_DAMAGETEXT_SPECTATORS_ONLY() && IS_OBSERVER(client))
-    )) return false;
+       entity attacker = this.realowner;
+       entity hit = this.enemy;
+       int flags = this.dent_net_flags;
+       int deathtype = this.dent_net_deathtype;
+       float health = this.dent_net_health;
+       float armor = this.dent_net_armor;
+       float potential_damage = this.dent_net_potential;
+       if (!(
+               (SV_DAMAGETEXT_ALL()) ||
+               (SV_DAMAGETEXT_PLAYERS() && client == attacker) ||
+               (SV_DAMAGETEXT_SPECTATORS_ONLY() && IS_SPEC(client) && client.enemy == attacker) ||
+               (SV_DAMAGETEXT_SPECTATORS_ONLY() && IS_OBSERVER(client))
+       )) return false;
 
-    WriteHeader(MSG_ENTITY, damagetext);
-    WriteByte(MSG_ENTITY, etof(hit));
-    WriteInt24_t(MSG_ENTITY, deathtype);
-    WriteByte(MSG_ENTITY, flags);
+       WriteHeader(MSG_ENTITY, damagetext);
+       WriteByte(MSG_ENTITY, etof(hit));
+       WriteInt24_t(MSG_ENTITY, deathtype);
+       WriteByte(MSG_ENTITY, flags);
 
-    // we need to send a few decimal places to minimize errors when accumulating damage
-    // sending them multiplied saves bandwidth compared to using WriteCoord,
-    // however if the multiplied damage would be too much for (signed) short, we send an int24
-    if (flags & DTFLAG_BIG_HEALTH) WriteInt24_t(MSG_ENTITY, health * DAMAGETEXT_PRECISION_MULTIPLIER);
-    else WriteShort(MSG_ENTITY, health * DAMAGETEXT_PRECISION_MULTIPLIER);
-    if (!(flags & DTFLAG_NO_ARMOR))
-    {
-        if (flags & DTFLAG_BIG_ARMOR) WriteInt24_t(MSG_ENTITY, armor * DAMAGETEXT_PRECISION_MULTIPLIER);
-        else WriteShort(MSG_ENTITY, armor * DAMAGETEXT_PRECISION_MULTIPLIER);
-    }
-    if (!(flags & DTFLAG_NO_POTENTIAL))
-    {
-        if (flags & DTFLAG_BIG_POTENTIAL) WriteInt24_t(MSG_ENTITY, potential_damage * DAMAGETEXT_PRECISION_MULTIPLIER);
-        else WriteShort(MSG_ENTITY, potential_damage * DAMAGETEXT_PRECISION_MULTIPLIER);
-    }
-    return true;
+       // we need to send a few decimal places to minimize errors when accumulating damage
+       // sending them multiplied saves bandwidth compared to using WriteCoord,
+       // however if the multiplied damage would be too much for (signed) short, we send an int24
+       if (flags & DTFLAG_BIG_HEALTH) WriteInt24_t(MSG_ENTITY, health * DAMAGETEXT_PRECISION_MULTIPLIER);
+       else WriteShort(MSG_ENTITY, health * DAMAGETEXT_PRECISION_MULTIPLIER);
+       if (!(flags & DTFLAG_NO_ARMOR))
+       {
+               if (flags & DTFLAG_BIG_ARMOR) WriteInt24_t(MSG_ENTITY, armor * DAMAGETEXT_PRECISION_MULTIPLIER);
+               else WriteShort(MSG_ENTITY, armor * DAMAGETEXT_PRECISION_MULTIPLIER);
+       }
+       if (!(flags & DTFLAG_NO_POTENTIAL))
+       {
+               if (flags & DTFLAG_BIG_POTENTIAL) WriteInt24_t(MSG_ENTITY, potential_damage * DAMAGETEXT_PRECISION_MULTIPLIER);
+               else WriteShort(MSG_ENTITY, potential_damage * DAMAGETEXT_PRECISION_MULTIPLIER);
+       }
+       return true;
 }
 
 MUTATOR_HOOKFUNCTION(damagetext, PlayerDamaged) {
-    if (SV_DAMAGETEXT_DISABLED()) return;
-    entity attacker = M_ARGV(0, entity);
-    entity hit = M_ARGV(1, entity); if (hit == attacker) return;
-    float health = M_ARGV(2, float);
-    float armor = M_ARGV(3, float);
-    int deathtype = M_ARGV(5, int);
-    float potential_damage = M_ARGV(6, float);
-    if(DEATH_WEAPONOF(deathtype) == WEP_VAPORIZER) return;
+       if (SV_DAMAGETEXT_DISABLED()) return;
+       entity attacker = M_ARGV(0, entity);
+       entity hit = M_ARGV(1, entity); if (hit == attacker) return;
+       float health = M_ARGV(2, float);
+       float armor = M_ARGV(3, float);
+       int deathtype = M_ARGV(5, int);
+       float potential_damage = M_ARGV(6, float);
+       if(DEATH_WEAPONOF(deathtype) == WEP_VAPORIZER) return;
 
-    int flags = 0;
-    if (SAME_TEAM(hit, attacker)) flags |= DTFLAG_SAMETEAM;
-    if (health >= DAMAGETEXT_SHORT_LIMIT) flags |= DTFLAG_BIG_HEALTH;
-    if (armor >= DAMAGETEXT_SHORT_LIMIT) flags |= DTFLAG_BIG_ARMOR;
-    if (potential_damage >= DAMAGETEXT_SHORT_LIMIT) flags |= DTFLAG_BIG_POTENTIAL;
-    if (!armor) flags |= DTFLAG_NO_ARMOR;
-    if (almost_equals_eps(armor + health, potential_damage, 5)) flags |= DTFLAG_NO_POTENTIAL;
+       int flags = 0;
+       if (SAME_TEAM(hit, attacker)) flags |= DTFLAG_SAMETEAM;
+       if (health >= DAMAGETEXT_SHORT_LIMIT) flags |= DTFLAG_BIG_HEALTH;
+       if (armor >= DAMAGETEXT_SHORT_LIMIT) flags |= DTFLAG_BIG_ARMOR;
+       if (potential_damage >= DAMAGETEXT_SHORT_LIMIT) flags |= DTFLAG_BIG_POTENTIAL;
+       if (!armor) flags |= DTFLAG_NO_ARMOR;
+       if (almost_equals_eps(armor + health, potential_damage, 5)) flags |= DTFLAG_NO_POTENTIAL;
 
-    entity net_text = new_pure(net_damagetext);
-    net_text.realowner = attacker;
-    net_text.enemy = hit;
-    net_text.dent_net_flags = flags;
-    net_text.dent_net_deathtype = deathtype;
-    net_text.dent_net_health = health;
-    net_text.dent_net_armor = armor;
-    net_text.dent_net_potential = potential_damage;
+       entity net_text = new_pure(net_damagetext);
+       net_text.realowner = attacker;
+       net_text.enemy = hit;
+       net_text.dent_net_flags = flags;
+       net_text.dent_net_deathtype = deathtype;
+       net_text.dent_net_health = health;
+       net_text.dent_net_armor = armor;
+       net_text.dent_net_potential = potential_damage;
 
-    setthink(net_text, SUB_Remove);
-    net_text.nextthink = (time > 10) ? (time + 0.5) : 10; // allow a buffer from start time for clients to load in
+       setthink(net_text, SUB_Remove);
+       net_text.nextthink = (time > 10) ? (time + 0.5) : 10; // allow a buffer from start time for clients to load in
 
-    Net_LinkEntity(net_text, false, 0, write_damagetext);
+       Net_LinkEntity(net_text, false, 0, write_damagetext);
 }