X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fannouncer.qc;h=0195db43a432e17e1e472155995451a8f703160d;hb=4096ab0591cbd7fac803e022375cd3c221511d8b;hp=fa8f2b0055b51395ed0248ae4129cc1e741d55fa;hpb=317ec3eb27ada1c4668876e9499136125acb7984;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index fa8f2b0055..0195db43a4 100644
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -1,9 +1,9 @@
 #include "announcer.qh"
 
-#include "mutators/events.qh"
+#include <client/mutators/_mod.qh>
 
-#include "../common/notifications.qh"
-#include "../common/stats.qh"
+#include <common/notifications/all.qh>
+#include <common/stats.qh>
 
 bool announcer_1min;
 bool announcer_5min;
@@ -11,19 +11,21 @@ string AnnouncerOption()
 {
 	string ret = autocvar_cl_announcer;
 	MUTATOR_CALLHOOK(AnnouncerOption, ret);
-	ret = ret_string;
+	ret = M_ARGV(0, string);
 	return ret;
 }
 
-void Announcer_Countdown()
+entity announcer_countdown;
+
+void Announcer_Countdown(entity this)
 {
-	SELFPARAM();
 	float starttime = STAT(GAMESTARTTIME);
-	float roundstarttime = getstatf(STAT_ROUNDSTARTTIME);
+	float roundstarttime = STAT(ROUNDSTARTTIME);
 	if(roundstarttime == -1)
 	{
 		Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTOP);
-		remove(this);
+		delete(this);
+		announcer_countdown = NULL;
 		return;
 	}
 	if(roundstarttime >= starttime)
@@ -38,7 +40,8 @@ void Announcer_Countdown()
 	{
 		Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_BEGIN);
 		Local_Notification(MSG_MULTI, MULTI_COUNTDOWN_BEGIN);
-		remove(this);
+		delete(this);
+		announcer_countdown = NULL;
 		return;
 	}
 	else // countdown is still going
@@ -47,12 +50,16 @@ 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);
 		}
 
 		this.nextthink = (starttime - (countdown - 1));
@@ -70,19 +77,31 @@ void Announcer_Countdown()
 void Announcer_Gamestart()
 {
 	float startTime = STAT(GAMESTARTTIME);
-	float roundstarttime = getstatf(STAT_ROUNDSTARTTIME);
+	float roundstarttime = STAT(ROUNDSTARTTIME);
 	if(roundstarttime > startTime)
 		startTime = roundstarttime;
+	if(intermission)
+	{
+		if(announcer_countdown)
+		{
+			centerprint_kill(ORDINAL(CPID_ROUND));
+			if(announcer_countdown)
+			{
+				delete(announcer_countdown);
+				announcer_countdown = NULL;
+			}
+		}
+		return;
+	}
 
 	if(previous_game_starttime != startTime)
 	{
 		if(time < startTime)
 		{
-			static entity announcer_countdown;
 			if (!announcer_countdown)
 			{
 				announcer_countdown = new(announcer_countdown);
-				announcer_countdown.think = Announcer_Countdown;
+				setthink(announcer_countdown, Announcer_Countdown);
 			}
 
 			if(time + 5.0 < startTime) // if connecting to server while restart was active don't always play prepareforbattle
@@ -96,63 +115,40 @@ void Announcer_Gamestart()
 	previous_game_starttime = startTime;
 }
 
+#define ANNOUNCER_CHECKMINUTE(minute) MACRO_BEGIN { \
+	if(announcer_##minute##min) { \
+		if(timeleft > minute * 60) \
+			announcer_##minute##min = false; \
+	} else { \
+		if(timeleft < minute * 60 && timeleft > minute * 60 - 1) { \
+			announcer_##minute##min = true; \
+			Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_##minute); \
+		} \
+	} \
+} MACRO_END
 
-// 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 + STAT(GAMESTARTTIME) - time);
-	float warmup_timeleft = 0;
+	if(intermission)
+		return;
 
+	float timeleft;
 	if(warmup_stage)
-		if(autocvar_g_warmup_limit > 0)
-			warmup_timeleft = max(0, autocvar_g_warmup_limit + STAT(GAMESTARTTIME) - time);
-
-	// 5 minute check
-	if(autocvar_cl_announcer_maptime >= 2)
 	{
-		// 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;
-		}
+		float warmup_timelimit = STAT(WARMUP_TIMELIMIT);
+		if(warmup_timelimit > 0)
+			timeleft = max(0, warmup_timelimit - time);
 		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 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);
-				}
-			}
-		}
+			timeleft = 0;
 	}
+	else
+		timeleft = max(0, STAT(TIMELIMIT) * 60 + STAT(GAMESTARTTIME) - time);
+
+	if(autocvar_cl_announcer_maptime >= 2)
+		ANNOUNCER_CHECKMINUTE(5);
 
-	// 1 minute check
 	if((autocvar_cl_announcer_maptime == 1) || (autocvar_cl_announcer_maptime == 3))
-	{
-		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;
-		}
-		else if(((!warmup_stage || autocvar_g_warmup_limit == 0) && timelimit > 0 && timeleft < 60)
-			|| (warmup_stage && autocvar_g_warmup_limit > 0 && warmup_timeleft < 60))
-		{
-			// if we're in warmup mode, check whether there's a warmup timelimit
-			if(!(autocvar_g_warmup_limit == -1 && warmup_stage))
-			{
-				announcer_1min = true;
-				Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_1);
-			}
-		}
-	}
+		ANNOUNCER_CHECKMINUTE(1);
 }
 
 void Announcer()