X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fannouncer.qc;h=a5b3eecb113348059da3013953e4697ff5b18a42;hb=c6a2f2ceed6a453934294f9dd44d4d8459e7a507;hp=62b732bec25034e773801113d86aa9f268bfcbf4;hpb=641c47df604de42c11c68a7d80813b29affcefb2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index 62b732bec..a5b3eecb1 100644
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -1,7 +1,7 @@
 #include "announcer.qh"
 
-#include "mutators/events.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)
 	{