]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix some mistakes
authorMario <mario@smbclan.net>
Fri, 10 Jun 2016 12:28:31 +0000 (22:28 +1000)
committerMario <mario@smbclan.net>
Fri, 10 Jun 2016 12:28:31 +0000 (22:28 +1000)
qcsrc/common/mutators/mutator/instagib/instagib.qc
qcsrc/common/mutators/mutator/overkill/overkill.qc
qcsrc/common/mutators/mutator/rocketminsta/rocketminsta.qc

index 8bd41449e0e2cc7b21bbca6467d06f41c9808f5e..0f1b199a446d542e3511925dd1e5d78cb1cdc1e3 100644 (file)
@@ -436,10 +436,9 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, CustomizeWaypoint)
 MUTATOR_HOOKFUNCTION(mutator_instagib, PlayerDies)
 {
        float frag_deathtype = M_ARGV(3, float);
-       float frag_damage = M_ARGV(4, float);
 
        if(DEATH_ISWEAPON(frag_deathtype, WEP_VAPORIZER))
-               frag_damage = 1000; // always gib if it was a vaporizer death
+               M_ARGV(4, float) = 1000; // always gib if it was a vaporizer death
 
        return false;
 }
index a9989be2f7d6540e5000ad80c9b516b656e0724f..d97e375b71d7725243af683deef8271aa668c05c 100644 (file)
@@ -97,25 +97,20 @@ MUTATOR_HOOKFUNCTION(ok, PlayerDamage_Calculate, CBC_ORDER_LAST)
        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);
-       vector frag_force = M_ARGV(6, vector);
 
        if(IS_PLAYER(frag_attacker) && IS_PLAYER(frag_target))
        if(DEATH_ISWEAPON(frag_deathtype, WEP_BLASTER))
        {
-               frag_damage = 0;
-
                if(frag_attacker != frag_target)
                if(frag_target.health > 0)
                if(STAT(FROZEN, frag_target) == 0)
                if(!IS_DEAD(frag_target))
                {
                        Send_Notification(NOTIF_ONE, frag_attacker, MSG_CENTER, CENTER_SECONDARY_NODAMAGE);
-                       frag_force = '0 0 0';
+                       M_ARGV(6, vector) = '0 0 0';
                }
 
-               M_ARGV(4, float) = frag_damage;
-               M_ARGV(6, vector) = frag_force;
+               M_ARGV(4, float) = 0;
        }
 
        return false;
index 143c985f6a38c3d56ecd0fe939ce8d1c44dcb873..ca4356ce1954f6c8cf0e84cb558a0120100f968d 100644 (file)
@@ -34,10 +34,9 @@ MUTATOR_HOOKFUNCTION(rm, PlayerDies)
        if(!autocvar_g_rm) { return false; }
 
        float frag_deathtype = M_ARGV(3, float);
-       float frag_damage = M_ARGV(4, float);
 
        if(DEATH_ISWEAPON(frag_deathtype, WEP_DEVASTATOR) || DEATH_ISWEAPON(frag_deathtype, WEP_ELECTRO))
-               frag_damage = 1000; // always gib if it was a vaporizer death
+               M_ARGV(4, float) = 1000; // always gib if it was a vaporizer death
 
        return false;
 }