From: FruitieX <fruitiex@gmail.com>
Date: Tue, 30 Nov 2010 16:17:48 +0000 (+0200)
Subject: do that in a bit of a cleaner manner (fixes CA which the previous change broke)
X-Git-Tag: xonotic-v0.1.0preview~86^2^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f4f09b1ff11f5537b10a138eae8d6edfa1d48426;p=xonotic%2Fxonotic-data.pk3dir.git

do that in a bit of a cleaner manner (fixes CA which the previous change broke)
---

diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc
index 1f9437e68..fbabbcf74 100644
--- a/qcsrc/server/arena.qc
+++ b/qcsrc/server/arena.qc
@@ -208,6 +208,7 @@ void Arena_Warmup()
 {
 	float f;
 	string msg;
+    entity e;
 
 	if((!g_arena && !g_ca && !g_freezetag) || (g_arena && !arena_roundbased) || (time < game_starttime))
 		return;
@@ -245,7 +246,6 @@ void Arena_Warmup()
 			else if(f == 1)
 				Announce("1");
 
-            entity e;
             FOR_EACH_PLAYER(e)
                 centerprint(e, msg);
 		}
@@ -270,10 +270,8 @@ void Arena_Warmup()
 		if(g_ca) {
 			ca_players = 0;
 
-            local entity oldself;
-            oldself = self;
+            FOR_EACH_PLAYER(e)
 				ca_players += 1;
-            self = oldself;
 		}
 
         if(self.classname == "player" && self.health > 0 && self.movetype == MOVETYPE_NONE)