Add cvar to show or hide secondary timer, and to show it swapped

[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 0dcbb70dba3cfe067d51160d74b2c26d8be70196..f52eecb16c45d134e506cea58af048ed5bb71f24 100644 (file)
--- a/qcsrc/client/hud/panel/timer.qc
+++ b/qcsrc/client/hud/panel/timer.qc
@@ -1,11 +1,25 @@
 #include "timer.qh"
 
-#include <client/autocvars.qh>
-#include <client/defs.qh>
-#include <client/miscfunctions.qh>
+#include <client/draw.qh>
+#include <client/view.qh>
 
 // Timer (#5)
 
+void HUD_Timer_Export(int fh)
+{
+       // allow saving cvars that aesthetically change the panel into hud skin files
+}
+
+vector HUD_Timer_Color(float timeleft)
+{
+       if(timeleft >= 300)
+               return '1 1 1'; //white
+       else if(timeleft >= 60)
+               return '1 1 0'; //yellow
+       else
+               return '1 0 0'; //red
+}
+
 void HUD_Timer()
 {
        if(!autocvar__hud_configure)
@@ -25,7 +39,6 @@ void HUD_Timer()
                HUD_Scale_Enable();
        else
                HUD_Scale_Disable();
-       HUD_Panel_DrawBg();
        if(panel_bg_padding)
        {
                pos += '1 1 0' * panel_bg_padding;
@@ -33,49 +46,109 @@ void HUD_Timer()
        }
 
        string timer;
-       float timelimit, timeleft, minutesLeft;
-
-       timelimit = STAT(TIMELIMIT);
-
-       timeleft = max(0, timelimit * 60 + STAT(GAMESTARTTIME) - time);
-       timeleft = ceil(timeleft);
-
-       minutesLeft = floor(timeleft / 60);
-
-       float warmup_timeleft = 0;
+       string subtimer = string_null;
+       string subtext = string_null;
+       float timelimit, timeleft, overtimes;
+       float round_timelimit, round_timeleft;
+       vector timer_size, subtext_size, subtimer_size;
+       vector timer_color = '1 1 1';
+       vector subtimer_color = '1 1 1';
+       bool swap = (autocvar_hud_panel_timer_secondary == 2);
+
+       // Calculate timelimit
        if(warmup_stage)
        {
-               float warmup_timelimit = STAT(WARMUP_TIMELIMIT);
-               if(warmup_timelimit > 0)
-                       warmup_timeleft = max(0, warmup_timelimit - time);
-               else if(warmup_timelimit == 0)
-                       warmup_timeleft = timeleft;
-               warmup_timeleft = ceil(warmup_timeleft);
+               timelimit = STAT(WARMUP_TIMELIMIT);
+               if(timelimit == 0)
+                       timelimit = STAT(TIMELIMIT) * 60;
        }
-
-       vector timer_color;
-       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
+       {
+               timelimit = STAT(TIMELIMIT) * 60;
+       }
+
+       // Calculate time left
+       timeleft = timelimit + STAT(GAMESTARTTIME) - time;
+       if (!autocvar_hud_panel_timer_unbound)
+               timeleft = bound(0, timeleft, timelimit);
+       timeleft = ceil(timeleft);
 
+       // Timer color
+       if(!intermission_time && !warmup_stage && timelimit > 0)
+               timer_color = HUD_Timer_Color(timeleft);
+
+       // Timer text
        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
-                       timer = seconds_tostring(floor(time - STAT(GAMESTARTTIME)));
+       } else if (autocvar_hud_panel_timer_increment || timelimit <= 0) {
+               float time_elapsed = floor(time - STAT(GAMESTARTTIME));
+               if (!autocvar_hud_panel_timer_unbound)
+                       time_elapsed = max(0, time_elapsed);
+
+               timer = seconds_tostring(time_elapsed);
        } else {
-               if(warmup_stage)
-                       timer = seconds_tostring(warmup_timeleft);
-               else
-                       timer = seconds_tostring(timeleft);
+               timer = seconds_tostring(timeleft);
+       }
+       
+       // Round-based game modes
+       if(STAT(ROUNDSTARTTIME) && autocvar_hud_panel_timer_secondary)
+       {
+               round_timelimit = STAT(ROUND_TIMELIMIT);
+
+               // Calculate round time left
+               round_timeleft = round_timelimit + STAT(ROUNDSTARTTIME) - time;
+               if (!autocvar_hud_panel_timer_unbound)
+                       round_timeleft = bound(0, round_timeleft, round_timelimit);
+               round_timeleft = ceil(round_timeleft);
+
+               // Subtimer color
+               if(!intermission_time && round_timelimit > 0)
+                       subtimer_color = HUD_Timer_Color(round_timeleft);
+
+               // Subtimer text
+               if (intermission_time) {
+                       subtimer = seconds_tostring(max(0, floor(intermission_time - STAT(ROUNDSTARTTIME))));
+               } else if (autocvar_hud_panel_timer_increment || round_timelimit <= 0) {
+                       float round_time_elapsed = floor(time - STAT(ROUNDSTARTTIME));
+                       if (!autocvar_hud_panel_timer_unbound)
+                               round_time_elapsed = max(0, round_time_elapsed);
+
+                       subtimer = seconds_tostring(round_time_elapsed);
+               } else {
+                       subtimer = seconds_tostring(round_timeleft);
+               }
        }
 
-       drawstring_aspect(pos, timer, mySize, timer_color, panel_fg_alpha, DRAWFLAG_NORMAL);
+       // Subtext
+       overtimes = STAT(OVERTIMESADDED);
+
+       if(warmup_stage || autocvar__hud_configure)
+               subtext = _("Warmup");
+       else if(intermission_time)
+               subtext = _("Intermission");
+       else if(STAT(TIMEOUT_STATUS))
+               subtext = _("Timeout");
+       else if (overtimes >= 2)
+               subtext = sprintf(_("Overtime #%d"), overtimes);
+       else if(overtimes)
+               subtext = _("Overtime");
+
+       subtext_size  = vec2(mySize.x, mySize.y / 3);
+       timer_size    = vec2(mySize.x, mySize.y - subtext_size.y);
+       subtimer_size = vec2(mySize.x / 3, mySize.y - subtext_size.y);
+       
+       panel_size.y -= subtext_size.y;
+       HUD_Panel_DrawBg();
+       
+       if(subtimer) {
+               timer_size.x -= subtimer_size.x;
+               drawstring_aspect(pos + eX * timer_size.x, (swap ? timer : subtimer), subtimer_size, (swap ? timer_color : subtimer_color), panel_fg_alpha, DRAWFLAG_NORMAL);
+       }
+       
+       drawstring_aspect(pos, (swap ? subtimer : timer), timer_size, (swap ? subtimer_color : timer_color), panel_fg_alpha, DRAWFLAG_NORMAL);
+       
+       if(subtext)
+               drawstring_aspect(pos + eY * timer_size.y, subtext, subtext_size, '0 1 0', panel_fg_alpha, DRAWFLAG_NORMAL);
 
        draw_endBoldFont();
 }