Merge branch 'master' into terencehill/glowmod_color_fix

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / announcer.qc

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index bcbe7244692eb85bb4c6c28fcf8e8c0b111fc252..a5b3eecb113348059da3013953e4697ff5b18a42 100644 (file)
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -1,7 +1,7 @@
 #include "announcer.qh"
 
+#include <client/hud/panel/centerprint.qh>
 #include <client/mutators/_mod.qh>
-
 #include <common/notifications/all.qh>
 #include <common/stats.qh>
 
@@ -84,7 +84,7 @@ void Announcer_Gamestart()
        {
                if(announcer_countdown)
                {
-                       centerprint_kill(ORDINAL(CPID_ROUND));
+                       centerprint_Kill(ORDINAL(CPID_ROUND));
                        if(announcer_countdown)
                        {
                                delete(announcer_countdown);
@@ -115,7 +115,7 @@ void Announcer_Gamestart()
        previous_game_starttime = startTime;
 }
 
-#define ANNOUNCER_CHECKMINUTE(minute) MACRO_BEGIN { \
+#define ANNOUNCER_CHECKMINUTE(minute) MACRO_BEGIN \
        if(announcer_##minute##min) { \
                if(timeleft > minute * 60) \
                        announcer_##minute##min = false; \
@@ -125,10 +125,13 @@ void Announcer_Gamestart()
                        Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_##minute); \
                } \
        } \
-} MACRO_END
+MACRO_END
 
 void Announcer_Time()
 {
+       if(intermission)
+               return;
+
        float timeleft;
        if(warmup_stage)
        {