X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fannouncer.qc;h=19e51cedc6b98f2611c274476fba9cc0430300d2;hb=fbb96108e5828a7557694db4469c2d0d7c582846;hp=35077496911a9ea8f8f56664068d3cd06437e3f0;hpb=0f0e69c6625fc4db17559e2e47f2fdaed8298076;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index 350774969..19e51cedc 100644
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -1,5 +1,12 @@
-float announcer_1min;
-float announcer_5min;
+#include "announcer.qh"
+#include "_all.qh"
+
+#include "../common/notifications.qh"
+#include "../common/stats.qh"
+#include "../common/util.qh"
+
+bool announcer_1min;
+bool announcer_5min;
 void Announcer_Countdown()
 {
 	float starttime = getstatf(STAT_GAMESTARTTIME);
@@ -13,7 +20,7 @@ void Announcer_Countdown()
 	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);
@@ -27,6 +34,7 @@ void Announcer_Countdown()
 	}
 	else // countdown is still going
 	{
+		// if concomitant countdown to round start overrides countdown to game start
 		if(roundstarttime == starttime)
 		{
 			Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTART, countdown_rounded);
@@ -59,9 +67,6 @@ void Announcer_Gamestart()
 
 	if(previous_game_starttime != startTime)
 	{
-		if((time + 5.0) < startTime) // if connecting to server while restart was active don't always play prepareforbattle
-			Local_Notification(MSG_ANNCE, ANNCE_PREPARE);
-
 		if(time < startTime)
 		{
 			entity e = find(world, classname, "announcer_countdown");
@@ -71,6 +76,11 @@ void Announcer_Gamestart()
 				e.classname = "announcer_countdown";
 				e.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
+				Local_Notification(MSG_ANNCE, ANNCE_PREPARE);
+
 			e.nextthink = startTime - floor(startTime - time); //synchronize nextthink to startTime
 		}
 	}
@@ -98,7 +108,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
 		{
@@ -108,7 +118,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);
 				}
 			}
@@ -122,7 +132,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))
@@ -130,7 +140,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);
 			}
 		}