Merge branch 'terencehill/cl_forceplayercolors_3' into 'master'

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

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index 0195db43a432e17e1e472155995451a8f703160d..ae04b5be15e5b866fda2a185ac58397727cd5101 100644 (file)
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -4,6 +4,7 @@
 
 #include <common/notifications/all.qh>
 #include <common/stats.qh>
+#include "hud/panel/centerprint.qh"
 
 bool announcer_1min;
 bool announcer_5min;
@@ -84,7 +85,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 +116,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,7 +126,7 @@ void Announcer_Gamestart()
                        Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_##minute); \
                } \
        } \
-} MACRO_END
+MACRO_END
 
 void Announcer_Time()
 {