X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fannouncer.qc;h=30231d1495420a3dbabcd86d404fc3dd044a79a3;hb=0f64a49d36ce2363cb3052153b7d8e4f2addeb6c;hp=f49b847d69d05c2a3bd8fecca9d932fe7ec95cc6;hpb=fe8acb6a250f104be282eacf6d1a5ba46c8783ff;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index f49b847d6..30231d149 100644
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -1,5 +1,16 @@
-float announcer_1min;
-float announcer_5min;
+#include "announcer.qh"
+
+#include "autocvars.qh"
+#include "main.qh"
+
+#include "../common/notifications.qh"
+#include "../common/stats.qh"
+#include "../common/util.qh"
+
+#include "../dpdefs/csprogsdefs.qh"
+
+bool announcer_1min;
+bool announcer_5min;
 void Announcer_Countdown()
 {
 	float starttime = getstatf(STAT_GAMESTARTTIME);
@@ -13,7 +24,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);
@@ -101,7 +112,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 +122,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 +136,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 +144,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);
 			}
 		}