From: Samual <samual@xonotic.org>
Date: Mon, 2 Apr 2012 06:40:10 +0000 (-0400)
Subject: Clean up centerprints for enemyflagcarrier announcement
X-Git-Tag: xonotic-v0.7.0~240^2~103
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=814e8c5bff1fbe3aa2512c5ea6228263262e5e56;p=xonotic%2Fxonotic-data.pk3dir.git

Clean up centerprints for enemyflagcarrier announcement
---

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 01902c077..c1f05feb6 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -616,17 +616,18 @@ void ctf_FlagThink()
 				if(!self.wpforenemy_announced)
 				{
 					FOR_EACH_REALPLAYER(tmp_entity)
+					{
 						if(tmp_entity == self.owner)
 							centerprint(tmp_entity, strcat("Enemies can now see you on radar! (held ", self.netname, " for ", ftos(autocvar_g_ctf_flagcarrier_waypointforenemy_time), " seconds)"));
-						else if(!IsDifferentTeam(tmp_entity, self.owner))
-							centerprint(tmp_entity, strcat("Enemies can now see your flag carrier on radar! (held ", self.netname, " for ", ftos(autocvar_g_ctf_flagcarrier_waypointforenemy_time), " seconds)"));
-						else if(!IsDifferentTeam(tmp_entity, self))
+						else if(IsDifferentTeam(tmp_entity, self.owner))
 							centerprint(tmp_entity, strcat("You can now see the enemy flag carrier on radar! (held ", self.netname, " for ", ftos(autocvar_g_ctf_flagcarrier_waypointforenemy_time), " seconds)"));
+						else
+							centerprint(tmp_entity, strcat("Enemies can now see your flag carrier on radar! (held ", self.netname, " for ", ftos(autocvar_g_ctf_flagcarrier_waypointforenemy_time), " seconds)"));
+					}
 					
 					self.wpforenemy_announced = TRUE;
 				}
 			}
-					
 			return;
 		}