X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fannouncer.qc;h=4287b7e0ad75f01f2a66173b9af039d7c861b682;hb=36b51bc6eef2790a1138f70a05bc4c09cff07245;hp=19e51cedc6b98f2611c274476fba9cc0430300d2;hpb=fc62dfa34fa5b13d63660d5249633af1222d6476;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index 19e51cedc..4287b7e0a 100644
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -1,20 +1,32 @@
 #include "announcer.qh"
-#include "_all.qh"
 
-#include "../common/notifications.qh"
-#include "../common/stats.qh"
-#include "../common/util.qh"
+#include "mutators/events.qh"
+
+#include <common/notifications/all.qh>
+#include <common/stats.qh>
 
 bool announcer_1min;
 bool announcer_5min;
+string AnnouncerOption()
+{
+	string ret = autocvar_cl_announcer;
+	MUTATOR_CALLHOOK(AnnouncerOption, ret);
+	ret = ret_string;
+	return ret;
+}
+
+entity announcer_countdown;
+
 void Announcer_Countdown()
 {
-	float starttime = getstatf(STAT_GAMESTARTTIME);
-	float roundstarttime = getstatf(STAT_ROUNDSTARTTIME);
+	SELFPARAM();
+	float starttime = STAT(GAMESTARTTIME);
+	float roundstarttime = STAT(ROUNDSTARTTIME);
 	if(roundstarttime == -1)
 	{
 		Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTOP);
-		remove(self);
+		remove(this);
+		announcer_countdown = NULL;
 		return;
 	}
 	if(roundstarttime >= starttime)
@@ -29,7 +41,8 @@ void Announcer_Countdown()
 	{
 		Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_BEGIN);
 		Local_Notification(MSG_MULTI, MULTI_COUNTDOWN_BEGIN);
-		remove(self);
+		remove(this);
+		announcer_countdown = NULL;
 		return;
 	}
 	else // countdown is still going
@@ -38,15 +51,19 @@ void Announcer_Countdown()
 		if(roundstarttime == starttime)
 		{
 			Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTART, countdown_rounded);
-			Local_Notification(MSG_ANNCE, Announcer_PickNumber(CNT_ROUNDSTART, countdown_rounded));
+			Notification annce_num = Announcer_PickNumber(CNT_ROUNDSTART, countdown_rounded);
+			if(annce_num != NULL)
+				Local_Notification(MSG_ANNCE, annce_num);
 		}
 		else
 		{
 			Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_GAMESTART, countdown_rounded);
-			Local_Notification(MSG_ANNCE, Announcer_PickNumber(CNT_GAMESTART, countdown_rounded));
+			Notification annce_num = Announcer_PickNumber(CNT_GAMESTART, countdown_rounded);
+			if(annce_num != NULL)		
+				Local_Notification(MSG_ANNCE, annce_num);
 		}
 
-		self.nextthink = (starttime - (countdown - 1));
+		this.nextthink = (starttime - (countdown - 1));
 	}
 }
 
@@ -60,28 +77,39 @@ void Announcer_Countdown()
  float previous_game_starttime;
 void Announcer_Gamestart()
 {
-	float startTime = getstatf(STAT_GAMESTARTTIME);
-	float roundstarttime = getstatf(STAT_ROUNDSTARTTIME);
+	float startTime = STAT(GAMESTARTTIME);
+	float roundstarttime = STAT(ROUNDSTARTTIME);
 	if(roundstarttime > startTime)
 		startTime = roundstarttime;
+	if(intermission)
+	{
+		if(announcer_countdown)
+		{
+			centerprint_kill(ORDINAL(CPID_ROUND));
+			if(announcer_countdown)
+			{
+				remove(announcer_countdown);
+				announcer_countdown = NULL;
+			}
+		}
+		return;
+	}
 
 	if(previous_game_starttime != startTime)
 	{
 		if(time < startTime)
 		{
-			entity e = find(world, classname, "announcer_countdown");
-			if (!e)
+			if (!announcer_countdown)
 			{
-				e = spawn();
-				e.classname = "announcer_countdown";
-				e.think = Announcer_Countdown;
+				announcer_countdown = new(announcer_countdown);
+				announcer_countdown.think = Announcer_Countdown;
 			}
 
 			if(time + 5.0 < startTime) // if connecting to server while restart was active don't always play prepareforbattle
-			if(time > e.nextthink) // don't play it again if countdown was already going
+			if(time > announcer_countdown.nextthink) // don't play it again if countdown was already going
 				Local_Notification(MSG_ANNCE, ANNCE_PREPARE);
 
-			e.nextthink = startTime - floor(startTime - time); //synchronize nextthink to startTime
+			announcer_countdown.nextthink = startTime - floor(startTime - time); //synchronize nextthink to startTime
 		}
 	}
 
@@ -92,13 +120,17 @@ void Announcer_Gamestart()
 // Plays the 1 minute or 5 minutes (of maptime) remaining sound, if client wants it
 void Announcer_Time()
 {
-	float timelimit = getstatf(STAT_TIMELIMIT);
-	float timeleft = max(0, timelimit * 60 + getstatf(STAT_GAMESTARTTIME) - time);
-	float warmup_timeleft = 0;
+	float timelimit = STAT(TIMELIMIT);
+	float timeleft = max(0, timelimit * 60 + STAT(GAMESTARTTIME) - time);
 
 	if(warmup_stage)
-		if(autocvar_g_warmup_limit > 0)
-			warmup_timeleft = max(0, autocvar_g_warmup_limit + getstatf(STAT_GAMESTARTTIME) - time);
+	{
+		float warmup_timelimit = STAT(WARMUP_TIMELIMIT);
+		if(warmup_timelimit > 0)
+			timeleft = max(0, warmup_timelimit - time);
+		else
+			timeleft = 0;
+	}
 
 	// 5 minute check
 	if(autocvar_cl_announcer_maptime >= 2)
@@ -106,21 +138,15 @@ void Announcer_Time()
 		// make sure that after connect (and e.g. 4 minutes left) we will not get a wrong sound
 		if(announcer_5min)
 		{
-			if(((!warmup_stage || autocvar_g_warmup_limit == 0) && timeleft > 300)
-				|| (warmup_stage && autocvar_g_warmup_limit > 0 && warmup_timeleft > 300))
-					announcer_5min = false;
+			if(timeleft > 300)
+				announcer_5min = false;
 		}
 		else
 		{
-			if(((!warmup_stage || autocvar_g_warmup_limit == 0) && timelimit > 0 && timeleft < 300 && timeleft > 299)
-				|| (warmup_stage && autocvar_g_warmup_limit > 0 && warmup_timeleft < 300 && warmup_timeleft > 299))
+			if(timeleft < 300 && timeleft > 299)
 			{
-				//if we're in warmup mode, check whether there's a warmup timelimit
-				if(!(autocvar_g_warmup_limit == -1 && warmup_stage))
-				{
-					announcer_5min = true;
-					Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_5);
-				}
+				announcer_5min = true;
+				Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_5);
 			}
 		}
 	}
@@ -128,17 +154,14 @@ void Announcer_Time()
 	// 1 minute check
 	if((autocvar_cl_announcer_maptime == 1) || (autocvar_cl_announcer_maptime == 3))
 	{
-		if (announcer_1min)
+		if(announcer_1min)
 		{
-			if(((!warmup_stage || autocvar_g_warmup_limit == 0) && timeleft > 60)
-				|| (warmup_stage && autocvar_g_warmup_limit > 0 && warmup_timeleft > 60))
-					announcer_1min = false;
+			if(timeleft > 60)
+				announcer_1min = false;
 		}
-		else if(((!warmup_stage || autocvar_g_warmup_limit == 0) && timelimit > 0 && timeleft < 60)
-			|| (warmup_stage && autocvar_g_warmup_limit > 0 && warmup_timeleft < 60))
+		else
 		{
-			// if we're in warmup mode, check whether there's a warmup timelimit
-			if(!(autocvar_g_warmup_limit == -1 && warmup_stage))
+			if(timeleft < 60 && timeleft > 59)
 			{
 				announcer_1min = true;
 				Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_1);