Merge branch 'master' into z411/annce_queue

[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 93da240eadcdbf68d8d5f210f2c3f3489b3edaa4..00a231b7cf44607d70fd56e338784f2fe3fdbdb5 100644 (file)
--- a/qcsrc/client/hud/panel/timer.qc
+++ b/qcsrc/client/hud/panel/timer.qc
@@ -1,4 +1,5 @@
 #include "timer.qh"
+#include "scoreboard.qh"
 
 #include <client/draw.qh>
 #include <client/view.qh>
@@ -12,12 +13,12 @@ void HUD_Timer_Export(int fh)
 
 vector HUD_Timer_Color(float timeleft)
 {
-       if(timeleft >= 300)
-               return '1 1 1'; //white
-       else if(timeleft >= 60)
-               return '1 1 0'; //yellow
+       if(timeleft <= 60)
+               return '1 0 0'; // red
+       else if(timeleft <= 300)
+               return '1 1 0'; // yellow
        else
-               return '1 0 0'; //red
+               return '1 1 1'; // white
 }
 
 float HUD_Timer_TimeElapsed(float curtime, float starttime)
@@ -73,15 +74,9 @@ void HUD_Timer()
        // Use real or frozen time and get the time limit
        curtime = (intermission_time ? intermission_time : time);
        if(warmup_stage)
-       {
                timelimit = STAT(WARMUP_TIMELIMIT);
-               if(timelimit == 0)
-                       timelimit = STAT(TIMELIMIT) * 60;
-       }
        else
-       {
                timelimit = STAT(TIMELIMIT) * 60;
-       }
 
        // Calculate time left
        timeleft = HUD_Timer_TimeLeft(curtime, STAT(GAMESTARTTIME), timelimit);
@@ -91,11 +86,11 @@ void HUD_Timer()
                timer_color = HUD_Timer_Color(timeleft);
 
        // Timer text
-       if (autocvar_hud_panel_timer_increment || timelimit == 0)
+       if (autocvar_hud_panel_timer_increment || timelimit <= 0)
                timer = seconds_tostring(HUD_Timer_TimeElapsed(curtime, STAT(GAMESTARTTIME)));
        else
                timer = seconds_tostring(timeleft);
-       
+
        // Secondary timer for round-based game modes
        if(STAT(ROUNDSTARTTIME) && autocvar_hud_panel_timer_secondary)
        {
@@ -129,8 +124,13 @@ void HUD_Timer()
        int overtimes = STAT(OVERTIMES);
 
        if(warmup_stage || autocvar__hud_configure)
-               subtext = _("Warmup");
-       else if(STAT(TIMEOUT_STATUS))
+       {
+               if (STAT(WARMUP_TIMELIMIT) > 0)
+                       subtext = _("Warmup");
+               else
+                       subtext = srv_minplayers ? _("Warmup: too few players") : _("Warmup: no time limit");
+       }
+       else if(STAT(TIMEOUT_STATUS) == 2)
                subtext = _("Timeout");
        else if (overtimes == -1)
                subtext = _("Sudden Death");
@@ -142,18 +142,18 @@ void HUD_Timer()
        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) {
                float subtimer_padding = subtimer_size.y / 5;
                timer_size.x -= subtimer_size.x;
                drawstring_aspect(pos + eX * timer_size.x + eY * subtimer_padding, (swap ? timer : subtimer), subtimer_size - eY * subtimer_padding * 2, (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);