From: Rudolf Polzer <divverent@xonotic.org>
Date: Wed, 19 Oct 2011 14:10:34 +0000 (+0200)
Subject: simplify some teamplay checks
X-Git-Tag: xonotic-v0.6.0~40^2~27
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b07a6beb6f973877faa75d7a91565bca47c298c3;p=xonotic%2Fxonotic-data.pk3dir.git

simplify some teamplay checks
---

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 5a583fc15..d7d2287ed 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -329,7 +329,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
 		}
 		else if (attacker.classname == "player")
 		{
-			if(teamplay && attacker.team == targ.team)
+			if(!IsDifferentTeam(attacker, targ))
 			{
 				if(attacker.team == COLOR_TEAM1)
 					type = KILL_TEAM_RED;
@@ -561,7 +561,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 				damage = 0;
 				force = '0 0 0';
 			}
-			else if(teamplay && attacker.team == targ.team)
+			else if(!IsDifferentTeam(attacker, targ))
 			{
 				if(autocvar_teamplay_mode == 1)
 					damage = 0;