From: bones_was_here <bones_was_here@xonotic.au>
Date: Mon, 26 Sep 2022 05:23:02 +0000 (+1000)
Subject: Prevent "Begin!" announcement & centreprint when returning to warmup
X-Git-Tag: xonotic-v0.8.6~348^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5989fc71850df6800390420117b26e49258d7901;p=xonotic%2Fxonotic-data.pk3dir.git

Prevent "Begin!" announcement & centreprint when returning to warmup

Applicable to ReadyRestart() / qc_cmd_sv resetmatch,
switching from unlimited to timed warmup (g_warmup -1),
and countdown abort (g_warmup -1).
---

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index e15bc23b7..780b582de 100644
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -130,7 +130,7 @@ void Announcer_Gamestart()
 	float roundstarttime = STAT(ROUNDSTARTTIME);
 	if(roundstarttime > startTime)
 		startTime = roundstarttime;
-	if(intermission)
+	if(intermission || warmup_stage)
 	{
 		Announcer_ClearTitle();
 		if(announcer_countdown)