From: terencehill <piuntn@gmail.com>
Date: Sun, 3 Mar 2013 23:42:11 +0000 (+0100)
Subject: Fix "one minute remains" sound spam during the countdown to round start, less than... 
X-Git-Tag: xonotic-v0.7.0~61^2~32
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=412e962b28e613a3cbd6bc6eb1818ccc310def0b;p=xonotic%2Fxonotic-data.pk3dir.git

Fix "one minute remains" sound spam during the countdown to round start, less than one minute left
---

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index 865f28b4d..5ca75123c 100644
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -23,8 +23,6 @@ void Announcer_Countdown()
 {
 	float starttime = getstatf(STAT_GAMESTARTTIME);
 	float roundstarttime = getstatf(STAT_ROUNDSTARTTIME);
-	if(starttime <= time) // game start time has passed
-		announcer_5min = announcer_1min = FALSE; // reset maptime announcers now as well
 	if(roundstarttime == -1)
 	{
 		// stop countdown immediately
@@ -34,6 +32,8 @@ void Announcer_Countdown()
 	}
 	if(roundstarttime >= starttime)
 		starttime = roundstarttime;
+	if(starttime <= time && roundstarttime != starttime) // game start time has passed
+		announcer_5min = announcer_1min = FALSE; // reset maptime announcers now as well
 
 	float countdown = (starttime - time);
 	float countdown_rounded = floor(0.5 + countdown);