Merge branch 'master' into z411/bai-server

[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 293247f951191325e9e63446c2904bce70aa942e..a9512a42fd73be39fbc9f613d09d26c84f3fc698 100644 (file)
--- a/qcsrc/client/hud/panel/timer.qc
+++ b/qcsrc/client/hud/panel/timer.qc
@@ -1,10 +1,11 @@
 #include "timer.qh"
 
-#include <client/autocvars.qh>
-#include <client/miscfunctions.qh>
+#include <client/draw.qh>
 #include <client/view.qh>
 
 // Timer (#5)
+float last_timeleft;
+int autocvar_cl_timer_countdown = 3; // 0 = disabled, 1 = always on, 2 = only spec, 3 = as dictated by server
 
 void HUD_Timer_Export(int fh)
 {
@@ -37,16 +38,33 @@ void HUD_Timer()
                mySize -= '2 2 0' * panel_bg_padding;
        }
 
-       string timer;
        string timer_sub = "";
-       float timelimit, timeleft, minutesLeft, overtimes;
+       float timelimit, timeleft, minutesLeft, overtimes, timeout_last;
 
        timelimit = STAT(TIMELIMIT);
        overtimes = STAT(OVERTIMESADDED);
+       timeout_last = STAT(TIMEOUT_LAST);
 
        timeleft = max(0, timelimit * 60 + STAT(GAMESTARTTIME) - time);
+       timeleft = min(timeleft, timelimit * 60);
        timeleft = ceil(timeleft);
 
+       // countdown sound
+       // if 3 use server dictated option, otherwise the client's
+       int countdown_type;
+       if(autocvar_cl_timer_countdown == 3)
+               countdown_type = sv_timer_countdown;
+       else
+               countdown_type = autocvar_cl_timer_countdown;
+       
+       if(countdown_type && !warmup_stage && timeleft > 0 && timeleft != last_timeleft && timeleft <= 10)
+       {
+               if(countdown_type == 1 || (countdown_type == 2 && spectatee_status))
+                       sound(NULL, CH_INFO, SND_ENDCOUNT, VOL_BASE, ATTN_NONE);
+               
+               last_timeleft = timeleft;
+       }
+
        minutesLeft = floor(timeleft / 60);
 
        float warmup_timeleft = 0;
@@ -69,27 +87,30 @@ void HUD_Timer()
                timer_color = '1 0 0'; //red
 
        if (intermission_time) {
-               timer = seconds_tostring(max(0, floor(intermission_time - STAT(GAMESTARTTIME))));
+               timer = max(0, floor(intermission_time - STAT(GAMESTARTTIME)));
                timer_sub = "Intermission";
        //} else if (autocvar_hud_panel_timer_increment || (!warmup_stage && timelimit == 0) || (warmup_stage && warmup_timeleft <= 0)) {
+       } else if (timeout_last) {
+               if(autocvar_hud_panel_timer_increment)
+                       timer = max(0, floor(timeout_last - STAT(GAMESTARTTIME)));
+               else
+                       timer = ceil(max(0, timelimit * 60 + STAT(GAMESTARTTIME) - timeout_last));
+               timer_sub = "Timeout";
        } else if (autocvar_hud_panel_timer_increment || timelimit == 0) {
+               // Time elapsed timer
                if((warmup_stage && warmup_timeleft <= 0) || time < STAT(GAMESTARTTIME))
-                       timer = seconds_tostring(0);
+                       timer = 0;
                else
-                       timer = seconds_tostring(floor(time - STAT(GAMESTARTTIME)));
+                       timer = floor(time - STAT(GAMESTARTTIME));
        } else {
+               // Time left timer
                if(warmup_stage) {
                        if(warmup_timeleft <= 0)
-                               timer = seconds_tostring(floor(timelimit * 60));
+                               timer = floor(timelimit * 60);
                        else
-                               timer = seconds_tostring(warmup_timeleft);
+                               timer = warmup_timeleft;
                } else {
-                       if (time < STAT(GAMESTARTTIME))
-                               timer = seconds_tostring(floor(timelimit * 60));
-                       else if (overtimes > 0)
-                               timer = seconds_tostring(floor(time - STAT(OVERTIMESTARTTIME)));
-                       else
-                               timer = seconds_tostring(timeleft);
+                       timer = timeleft;
                }
        }
        
@@ -100,7 +121,7 @@ void HUD_Timer()
        else if (overtimes > 1)
                timer_sub = sprintf("Overtime #%d", overtimes);
        
-       drawstring_aspect(pos, timer, mySize, timer_color, panel_fg_alpha, DRAWFLAG_NORMAL);
+       drawstring_aspect(pos, seconds_tostring(timer), mySize, timer_color, panel_fg_alpha, DRAWFLAG_NORMAL);
        
        if(timer_sub != "") {
                pos.y += mySize.y;