From: z411 <z411@omaera.org>
Date: Fri, 2 Apr 2021 00:12:14 +0000 (-0300)
Subject: Avoid counting down while in timeout
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0af86937ced22810ad507e8bbe4160bbe7cd6914;p=xonotic%2Fxonotic-data.pk3dir.git

Avoid counting down while in timeout
---

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index d6f2f5065..28b5c1b1f 100644
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -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