Manual riddance of remaining "if not".

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

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index 7a4ed9223ad090d0549c5453e3e930819e9281c7..24be944d288ecb15fe1ef02f8b2f3eb3741317e6 100644 (file)
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -1,16 +1,3 @@
-void Announcer_Play(string announcement)
-{
-       /*if((announcement != previous_announcement) || (time >= (previous_announcement_time + autocvar_cl_announcer_antispam)))
-       {
-               sound(world, CH_INFO, strcat("announcer/", autocvar_cl_announcer, "/", announcement, ".wav"), VOL_BASEVOICE, ATTN_NONE);
-
-               if(previous_announcement) { strunzone(previous_announcement); }
-               
-               previous_announcement = strzone(announcement);
-               previous_announcement_time = time;
-       }*/
-}
-
 float announcer_1min;
 float announcer_5min;
 void Announcer_Countdown() 
@@ -41,15 +28,14 @@ void Announcer_Countdown()
        else // countdown is still going
        {
                if(roundstarttime == starttime)
+               {
                        Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTART, countdown_rounded);
+                       Local_Notification(MSG_ANNCE, Announcer_PickNumber(CNT_ROUNDSTART, countdown_rounded));
+               }
                else
-                       Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_GAMESTART, countdown_rounded);
-
-               switch(countdown_rounded)
                {
-                       case 1: Local_Notification(MSG_ANNCE, ANNCE_NUM_1); break;
-                       case 2: Local_Notification(MSG_ANNCE, ANNCE_NUM_2); break;
-                       case 3: Local_Notification(MSG_ANNCE, ANNCE_NUM_3); break;
+                       Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_GAMESTART, countdown_rounded);
+                       Local_Notification(MSG_ANNCE, Announcer_PickNumber(CNT_GAMESTART, countdown_rounded));
                }
 
                self.nextthink = (starttime - (countdown - 1));
@@ -79,7 +65,7 @@ void Announcer_Gamestart()
                if(time < startTime) 
                {
                        entity e = find(world, classname, "announcer_countdown");
-                       if not(e)
+                       if (!e)
                        {
                                e = spawn();
                                e.classname = "announcer_countdown";
@@ -120,7 +106,7 @@ void Announcer_Time()
                                || (warmup_stage && autocvar_g_warmup_limit > 0 && warmup_timeleft < 300 && warmup_timeleft > 299))
                        {
                                //if we're in warmup mode, check whether there's a warmup timelimit
-                               if not(autocvar_g_warmup_limit == -1 && warmup_stage) 
+                               if(!(autocvar_g_warmup_limit == -1 && warmup_stage))
                                {
                                        announcer_5min = TRUE;
                                        Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_5);
@@ -142,7 +128,7 @@ void Announcer_Time()
                        || (warmup_stage && autocvar_g_warmup_limit > 0 && warmup_timeleft < 60))
                {
                        // if we're in warmup mode, check whether there's a warmup timelimit
-                       if not(autocvar_g_warmup_limit == -1 && warmup_stage) 
+                       if(!(autocvar_g_warmup_limit == -1 && warmup_stage))
                        {
                                announcer_1min = TRUE;
                                Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_1);