]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Avoid counting down while in timeout
authorz411 <z411@omaera.org>
Fri, 2 Apr 2021 00:12:14 +0000 (21:12 -0300)
committerz411 <z411@omaera.org>
Fri, 2 Apr 2021 00:12:14 +0000 (21:12 -0300)
qcsrc/client/announcer.qc

index d6f2f506518ee4df12e394cae61c63e2435e0386..28b5c1b1f32b40ed4d9bc842e27bb1291bb24b80 100644 (file)
@@ -70,10 +70,12 @@ void Announcer_Countdown(entity this)
                // counting down to rounds
                if(rounds)
                {
-                       Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTART, countdown_rounded);
-                       Notification annce_num = Announcer_PickNumber(CNT_ROUNDSTART, countdown_rounded);
-                       if(annce_num != NULL)
-                               Local_Notification(MSG_ANNCE, annce_num);
+                       if (timeout_status != TIMEOUT_ACTIVE) {
+                               Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTART, countdown_rounded);
+                               Notification annce_num = Announcer_PickNumber(CNT_ROUNDSTART, countdown_rounded);
+                               if(annce_num != NULL)
+                                       Local_Notification(MSG_ANNCE, annce_num);
+                       }
                        this.nextthink = (roundstarttime - (countdown - 1));
                }
                else