Stop centerprint countdown messages when an arena/CA/freezetag game ends

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / arena.qc

diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc
index 31698e92294590fd90c58605ab052c44e777c561..a51da69ff041b1afc9051f69b789692ef2f58c7e 100644 (file)
--- a/qcsrc/server/arena.qc
+++ b/qcsrc/server/arena.qc
@@ -197,9 +197,15 @@ void Arena_Warmup()
 
        if(gameover)
        {
+               if(warmup && time < warmup)
+               {
+                       FOR_EACH_REALCLIENT(e)
+                               Send_CSQC_Centerprint_Generic_Expire(e, CPID_ROUND_STARTING);
+                       warmup = 0;
+               }
                if(champion && g_arena)
                {
-                       FOR_EACH_CLIENT(e)
+                       FOR_EACH_REALCLIENT(e)
                                centerprint(e, strcat("The Champion is ", champion.netname));
                        champion = world;
                }
@@ -221,14 +227,14 @@ void Arena_Warmup()
                        allowed_to_spawn = 1;
                if(champion && g_arena)
                {
-                       FOR_EACH_PLAYER(e)
+                       FOR_EACH_REALCLIENT(e)
                                centerprint(e, strcat("The Champion is ", champion.netname));
                }
 
                if(f != roundStartTime_prev) {
                        roundStartTime_prev = f;
                        if(g_ca && !(red_players && blue_players)) {
-                               FOR_EACH_PLAYER(self)
+                               FOR_EACH_REALCLIENT(self)
                                        Send_CSQC_Centerprint_Generic(self, CPID_ROUND_STARTING, "^1Need at least 1 player in each team to play CA", 2, 0);
                                warmup = time + autocvar_g_ca_warmup;
                        } else {
@@ -241,7 +247,7 @@ void Arena_Warmup()
                                else if(f == 1)
                                        Announce("1");
 
-                               FOR_EACH_PLAYER(e)
+                               FOR_EACH_REALCLIENT(e)
                                        Send_CSQC_Centerprint_Generic(e, CPID_ROUND_STARTING, "Round will start in %d", 1, f);
                        }
                }
@@ -267,7 +273,7 @@ void Arena_Warmup()
                                reset_map(TRUE);
                } else {
                        Announce("begin");
-                       FOR_EACH_PLAYER(e)
+                       FOR_EACH_REALCLIENT(e)
                                Send_CSQC_Centerprint_Generic(e, CPID_ROUND_STARTING, "^1Begin!", 1, 0);
                }