From: Mario <mario@smbclan.net>
Date: Thu, 14 Apr 2016 06:48:22 +0000 (+1000)
Subject: Don't negate frags if automatically switched teams
X-Git-Tag: xonotic-v0.8.2~962
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=556ac915a990a1df1eb132a1a79e1d33970c633f;p=xonotic%2Fxonotic-data.pk3dir.git

Don't negate frags if automatically switched teams
---

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 86e260e9f..675b794ec 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -328,7 +328,8 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype)
 			return;
 		}
 		LogDeath("suicide", deathtype, targ, targ);
-		GiveFrags(attacker, targ, -1, deathtype);
+		if(deathtype != DEATH_AUTOTEAMCHANGE.m_id) // special case: don't negate frags if auto switched
+			GiveFrags(attacker, targ, -1, deathtype);
 	}
 
 	// ======