X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fannouncer.qc;h=ae04b5be15e5b866fda2a185ac58397727cd5101;hp=0a0959b87ae09bb088725c13a4a8c970a5876264;hb=b5badea32b3346357fd7875731654d2aab9bad52;hpb=eac60648c4017e495060dd3ba9e50ac4bad5000a

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index 0a0959b87..ae04b5be1 100644
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -1,9 +1,10 @@
 #include "announcer.qh"
 
-#include "mutators/events.qh"
+#include <client/mutators/_mod.qh>
 
 #include <common/notifications/all.qh>
 #include <common/stats.qh>
+#include "hud/panel/centerprint.qh"
 
 bool announcer_1min;
 bool announcer_5min;
@@ -24,7 +25,7 @@ void Announcer_Countdown(entity this)
 	if(roundstarttime == -1)
 	{
 		Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTOP);
-		remove(this);
+		delete(this);
 		announcer_countdown = NULL;
 		return;
 	}
@@ -40,7 +41,7 @@ void Announcer_Countdown(entity this)
 	{
 		Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_BEGIN);
 		Local_Notification(MSG_MULTI, MULTI_COUNTDOWN_BEGIN);
-		remove(this);
+		delete(this);
 		announcer_countdown = NULL;
 		return;
 	}
@@ -58,7 +59,7 @@ void Announcer_Countdown(entity this)
 		{
 			Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_GAMESTART, countdown_rounded);
 			Notification annce_num = Announcer_PickNumber(CNT_GAMESTART, countdown_rounded);
-			if(annce_num != NULL)		
+			if(annce_num != NULL)
 				Local_Notification(MSG_ANNCE, annce_num);
 		}
 
@@ -84,10 +85,10 @@ void Announcer_Gamestart()
 	{
 		if(announcer_countdown)
 		{
-			centerprint_kill(ORDINAL(CPID_ROUND));
+			centerprint_Kill(ORDINAL(CPID_ROUND));
 			if(announcer_countdown)
 			{
-				remove(announcer_countdown);
+				delete(announcer_countdown);
 				announcer_countdown = NULL;
 			}
 		}
@@ -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,10 +126,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)
 	{