X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_player.qc;h=07da206f663f26ceb08eb2f405577912a239e829;hp=ffd6dcd45ad3da72a57d2c48ad8995a5adcc5f16;hb=2c0e35d3ee9fe6652c9c56f29dbbf546da0043b0;hpb=89090ed86cb0cf70f8a5dd6e6ae9488d72452730

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index ffd6dcd45a..07da206f66 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -495,7 +495,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 	if(vbot || IS_REAL_CLIENT(self))
 	if(abot || IS_REAL_CLIENT(attacker))
 	if(attacker && self != attacker)
-	if(IsDifferentTeam(self, attacker))
+	if(DIFF_TEAM(self, attacker))
 	{
 		if(DEATH_ISSPECIAL(deathtype))
 			awep = attacker.weapon;
@@ -857,7 +857,7 @@ float Say(entity source, float teamsay, entity privatesay, string msgin, float f
 	if not(IS_PLAYER(source))
 	{
 		if not(intermission_running)
-			if(teamsay || (autocvar_g_chat_nospectators == 1) || (autocvar_g_chat_nospectators == 2 && !(inWarmupStage || gameover)))
+			if(teamsay || (autocvar_g_chat_nospectators == 1) || (autocvar_g_chat_nospectators == 2 && !(warmup_stage || gameover)))
 				teamsay = -1; // spectators
 	}