]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
do that in a bit of a cleaner manner (fixes CA which the previous change broke)
authorFruitieX <fruitiex@gmail.com>
Tue, 30 Nov 2010 16:17:48 +0000 (18:17 +0200)
committerFruitieX <fruitiex@gmail.com>
Tue, 30 Nov 2010 16:17:48 +0000 (18:17 +0200)
qcsrc/server/arena.qc

index 1f9437e6870fb911f56da8525e281ddeb1b316b4..fbabbcf74ac6c4e5c0bfff4ae32ab41ec2fd734e 100644 (file)
@@ -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)