]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/client/announcer.qc
Add a stat for warmup limit so the hud timer can show decreasing time and announcer...
[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / announcer.qc
index fa8f2b0055b51395ed0248ae4129cc1e741d55fa..4287b7e0ad75f01f2a66173b9af039d7c861b682 100644 (file)
@@ -2,8 +2,8 @@
 
 #include "mutators/events.qh"
 
-#include "../common/notifications.qh"
-#include "../common/stats.qh"
+#include <common/notifications/all.qh>
+#include <common/stats.qh>
 
 bool announcer_1min;
 bool announcer_5min;
@@ -15,15 +15,18 @@ string AnnouncerOption()
        return ret;
 }
 
+entity announcer_countdown;
+
 void Announcer_Countdown()
 {
        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);
+               announcer_countdown = NULL;
                return;
        }
        if(roundstarttime >= starttime)
@@ -39,6 +42,7 @@ void Announcer_Countdown()
                Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_BEGIN);
                Local_Notification(MSG_MULTI, MULTI_COUNTDOWN_BEGIN);
                remove(this);
+               announcer_countdown = NULL;
                return;
        }
        else // countdown is still going
@@ -47,12 +51,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,15 +78,27 @@ 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)
+                       {
+                               remove(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);
@@ -100,13 +120,17 @@ 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 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 + STAT(GAMESTARTTIME) - time);
+       {
+               float warmup_timelimit = STAT(WARMUP_TIMELIMIT);
+               if(warmup_timelimit > 0)
+                       timeleft = max(0, warmup_timelimit - time);
+               else
+                       timeleft = 0;
+       }
 
        // 5 minute check
        if(autocvar_cl_announcer_maptime >= 2)
@@ -114,21 +138,15 @@ void Announcer_Time()
                // 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;
+                       if(timeleft > 300)
+                               announcer_5min = false;
                }
                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(timeleft < 300 && 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);
-                               }
+                               announcer_5min = true;
+                               Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_5);
                        }
                }
        }
@@ -136,17 +154,14 @@ void Announcer_Time()
        // 1 minute check
        if((autocvar_cl_announcer_maptime == 1) || (autocvar_cl_announcer_maptime == 3))
        {
-               if (announcer_1min)
+               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;
+                       if(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))
+               else
                {
-                       // if we're in warmup mode, check whether there's a warmup timelimit
-                       if(!(autocvar_g_warmup_limit == -1 && warmup_stage))
+                       if(timeleft < 60 && timeleft > 59)
                        {
                                announcer_1min = true;
                                Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_1);