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

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index 865f28b4de3084a7a851d37e805836703898a16f..5ca75123cd8840c86b0299c2977cfc00bab86172 100644 (file)
--- 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);