From: Mario <mario.mario@y7mail.com>
Date: Sun, 12 Jul 2020 19:04:26 +0000 (+1000)
Subject: Use the mirror damage deathtype when players are killed for friendly fire in the... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8d27433ddcefa301f81affd5dc8c24cb10999ce0;p=xonotic%2Fxonotic-data.pk3dir.git

Use the mirror damage deathtype when players are killed for friendly fire in the survival gamemode
---

diff --git a/qcsrc/common/gamemodes/gamemode/survival/sv_survival.qc b/qcsrc/common/gamemodes/gamemode/survival/sv_survival.qc
index 72a0c499e..982f38b87 100644
--- a/qcsrc/common/gamemodes/gamemode/survival/sv_survival.qc
+++ b/qcsrc/common/gamemodes/gamemode/survival/sv_survival.qc
@@ -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;
 }