X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fannouncer.qc;h=109d014374bff33184d39b5a4deafb855ea757e6;hb=322fd059ab536367167b2af916657715a886a068;hp=f49b847d69d05c2a3bd8fecca9d932fe7ec95cc6;hpb=12e23132497ee2f6ebe5d7b77cef7f9cba0bb55c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index f49b847d6..109d01437 100644
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -1,19 +1,38 @@
-float announcer_1min;
-float announcer_5min;
+#include "announcer.qh"
+
+#include "mutators/events.qh"
+
+#include "../common/notifications.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)
 		starttime = roundstarttime;
 	if(starttime <= time && roundstarttime != starttime) // game start time has passed
-		announcer_5min = announcer_1min = FALSE; // reset maptime announcers now as well
+		announcer_5min = announcer_1min = false; // reset maptime announcers now as well
 
 	float countdown = (starttime - time);
 	float countdown_rounded = floor(0.5 + countdown);
@@ -22,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
@@ -39,7 +59,7 @@ void Announcer_Countdown()
 			Local_Notification(MSG_ANNCE, Announcer_PickNumber(CNT_GAMESTART, countdown_rounded));
 		}
 
-		self.nextthink = (starttime - (countdown - 1));
+		this.nextthink = (starttime - (countdown - 1));
 	}
 }
 
@@ -53,8 +73,8 @@ 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;
 
@@ -62,19 +82,17 @@ void Announcer_Gamestart()
 	{
 		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
 		}
 	}
 
@@ -85,13 +103,13 @@ 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 timelimit = STAT(TIMELIMIT);
+	float timeleft = max(0, timelimit * 60 + STAT(GAMESTARTTIME) - time);
 	float warmup_timeleft = 0;
 
 	if(warmup_stage)
 		if(autocvar_g_warmup_limit > 0)
-			warmup_timeleft = max(0, autocvar_g_warmup_limit + getstatf(STAT_GAMESTARTTIME) - time);
+			warmup_timeleft = max(0, autocvar_g_warmup_limit + STAT(GAMESTARTTIME) - time);
 
 	// 5 minute check
 	if(autocvar_cl_announcer_maptime >= 2)
@@ -101,7 +119,7 @@ void Announcer_Time()
 		{
 			if(((!warmup_stage || autocvar_g_warmup_limit == 0) && timeleft > 300)
 				|| (warmup_stage && autocvar_g_warmup_limit > 0 && warmup_timeleft > 300))
-					announcer_5min = FALSE;
+					announcer_5min = false;
 		}
 		else
 		{
@@ -111,7 +129,7 @@ void Announcer_Time()
 				//if we're in warmup mode, check whether there's a warmup timelimit
 				if(!(autocvar_g_warmup_limit == -1 && warmup_stage))
 				{
-					announcer_5min = TRUE;
+					announcer_5min = true;
 					Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_5);
 				}
 			}
@@ -125,7 +143,7 @@ void Announcer_Time()
 		{
 			if(((!warmup_stage || autocvar_g_warmup_limit == 0) && timeleft > 60)
 				|| (warmup_stage && autocvar_g_warmup_limit > 0 && warmup_timeleft > 60))
-					announcer_1min = FALSE;
+					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))
@@ -133,7 +151,7 @@ void Announcer_Time()
 			// if we're in warmup mode, check whether there's a warmup timelimit
 			if(!(autocvar_g_warmup_limit == -1 && warmup_stage))
 			{
-				announcer_1min = TRUE;
+				announcer_1min = true;
 				Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_1);
 			}
 		}