take3: format 903 files

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud / panel / timer.qc

diff --git a/qcsrc/client/hud/panel/timer.qc b/qcsrc/client/hud/panel/timer.qc
index fab0392dc08938d19dd27046faf608e9f1241931..d9fa90669490424921c95d81d8c5ed92de57eb49 100644 (file)
--- a/qcsrc/client/hud/panel/timer.qc
+++ b/qcsrc/client/hud/panel/timer.qc
@@ -1,12 +1,15 @@
 #include "timer.qh"
 
+#include <client/autocvars.qh>
+#include <client/defs.qh>
+#include <client/miscfunctions.qh>
+
 // Timer (#5)
 
 void HUD_Timer()
 {
-       if(!autocvar__hud_configure)
-       {
-               if(!autocvar_hud_panel_timer) return;
+       if (!autocvar__hud_configure) {
+               if (!autocvar_hud_panel_timer) { return; }
        }
 
        HUD_Panel_LoadCvars();
@@ -17,13 +20,13 @@ void HUD_Timer()
        pos = panel_pos;
        mySize = panel_size;
 
-       if (autocvar_hud_panel_timer_dynamichud)
+       if (autocvar_hud_panel_timer_dynamichud) {
                HUD_Scale_Enable();
-       else
+       } else {
                HUD_Scale_Disable();
+       }
        HUD_Panel_DrawBg();
-       if(panel_bg_padding)
-       {
+       if (panel_bg_padding) {
                pos += '1 1 0' * panel_bg_padding;
                mySize -= '2 2 0' * panel_bg_padding;
        }
@@ -39,36 +42,38 @@ void HUD_Timer()
        minutesLeft = floor(timeleft / 60);
 
        float warmup_timeleft = 0;
-       if(warmup_stage)
-       {
+       if (warmup_stage) {
                float warmup_timelimit = STAT(WARMUP_TIMELIMIT);
-               if(warmup_timelimit > 0)
+               if (warmup_timelimit > 0) {
                        warmup_timeleft = max(0, warmup_timelimit - time);
-               else if(warmup_timelimit == 0)
+               } else if (warmup_timelimit == 0) {
                        warmup_timeleft = timeleft;
+               }
                warmup_timeleft = ceil(warmup_timeleft);
        }
 
        vector timer_color;
-       if(gameover_time || minutesLeft >= 5 || warmup_stage || timelimit == 0)
-               timer_color = '1 1 1'; //white
-       else if(minutesLeft >= 1)
-               timer_color = '1 1 0'; //yellow
-       else
-               timer_color = '1 0 0'; //red
-
-       if (gameover_time) {
-               timer = seconds_tostring(max(0, floor(gameover_time - STAT(GAMESTARTTIME))));
+       if (intermission_time || minutesLeft >= 5 || warmup_stage || timelimit == 0) {
+               timer_color = '1 1 1'; // white
+       } else if (minutesLeft >= 1) {
+               timer_color = '1 1 0'; // yellow
+       } else {
+               timer_color = '1 0 0'; // red
+       }
+       if (intermission_time) {
+               timer = seconds_tostring(max(0, floor(intermission_time - STAT(GAMESTARTTIME))));
        } else if (autocvar_hud_panel_timer_increment || (!warmup_stage && timelimit == 0) || (warmup_stage && warmup_timeleft <= 0)) {
-               if (time < STAT(GAMESTARTTIME))
-                       timer = seconds_tostring(0); //while restart is still active, show 00:00
-               else
+               if (time < STAT(GAMESTARTTIME)) {
+                       timer = seconds_tostring(0); // while restart is still active, show 00:00
+               } else {
                        timer = seconds_tostring(floor(time - STAT(GAMESTARTTIME)));
+               }
        } else {
-               if(warmup_stage)
+               if (warmup_stage) {
                        timer = seconds_tostring(warmup_timeleft);
-               else
+               } else {
                        timer = seconds_tostring(timeleft);
+               }
        }
 
        drawstring_aspect(pos, timer, mySize, timer_color, panel_fg_alpha, DRAWFLAG_NORMAL);