]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Removed fall damage, initially added by an oversight.
authordrjaska <drjaska83@gmail.com>
Fri, 12 Mar 2021 04:58:56 +0000 (06:58 +0200)
committerdrjaska <drjaska83@gmail.com>
Fri, 12 Mar 2021 04:58:56 +0000 (06:58 +0200)
qcsrc/common/gamemodes/gamemode/mayhem/sv_mayhem.qc

index b868b14ac52aef5bad2364a2061bb53d0d244f75..93b6d6346189009613cbdd62402410105ba34625 100644 (file)
@@ -64,9 +64,10 @@ MUTATOR_HOOKFUNCTION(mayhem, Damage_Calculate)
 {
        entity frag_attacker = M_ARGV(1, entity);
        entity frag_target = M_ARGV(2, entity);
+       float frag_deathtype = M_ARGV(3, float);
        float frag_damage = M_ARGV(4, float);
 
-       if (frag_target == frag_attacker)
+       if (frag_target == frag_attacker || frag_deathtype == DEATH_FALL.m_id)
                frag_damage = 0;
 
        M_ARGV(4, float) = frag_damage;