]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Use the mirror damage deathtype when players are killed for friendly fire in the...
authorMario <mario.mario@y7mail.com>
Sun, 12 Jul 2020 19:04:26 +0000 (05:04 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 12 Jul 2020 19:04:26 +0000 (05:04 +1000)
qcsrc/common/gamemodes/gamemode/survival/sv_survival.qc

index 72a0c499e66fd541e7fac0af892d67a2e8165c18..982f38b87f5a2a928dc9af8b0ad4420c4b53581e 100644 (file)
@@ -315,8 +315,7 @@ MUTATOR_HOOKFUNCTION(surv, PlayerDies)
        // killed an ally! punishment is death
        if(autocvar_g_survival_punish_teamkill && frag_attacker != frag_target && IS_PLAYER(frag_attacker) && IS_PLAYER(frag_target) && frag_attacker.survival_status == frag_target.survival_status && !ITEM_DAMAGE_NEEDKILL(frag_deathtype))
        if(!warmup_stage && round_handler_IsActive() && round_handler_IsRoundStarted()) // don't autokill if the round hasn't
-               ClientKill_Silent(frag_attacker, 0);
-               //Damage(frag_attacker, frag_attacker, frag_attacker, 100000, DEATH_AUTOTEAMCHANGE.m_id, DMG_NOWEP, frag_attacker.origin, '0 0 0');
+               Damage(frag_attacker, frag_attacker, frag_attacker, 100000, DEATH_MIRRORDAMAGE.m_id, DMG_NOWEP, frag_attacker.origin, '0 0 0');
        return true;
 }