Merge branch 'master' into Mario/showspecs

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / announcer.qc

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index f49b847d69d05c2a3bd8fecca9d932fe7ec95cc6..116dba7d3cc5898bf6acc70f13772e810babdd6c 100644 (file)
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -1,5 +1,16 @@
-float announcer_1min;
-float announcer_5min;
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qh"
+    #include "../common/stats.qh"
+    #include "../common/util.qh"
+    #include "autocvars.qh"
+    #include "../common/notifications.qh"
+    #include "main.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
+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);
                        }
                }