mySize -= '2 2 0' * panel_bg_padding;
}
- string timer;
- float timelimit, timeleft, minutesLeft;
+ string timer_sub = "";
+ float timelimit, timeleft, minutesLeft, overtimes, timeout_last;
timelimit = STAT(TIMELIMIT);
+ overtimes = STAT(OVERTIMESADDED);
+ timeout_last = STAT(TIMEOUT_LAST);
- timeleft = bound(0, timelimit * 60 + STAT(GAMESTARTTIME) - time, timelimit * 60);
+ if (autocvar_hud_panel_timer_unbound){
+ timeleft = max(0, timelimit * 60 + STAT(GAMESTARTTIME) - time);
+ } else {
+ timeleft = bound(0, timelimit * 60 + STAT(GAMESTARTTIME) - time, 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;
timer_color = '1 0 0'; //red
if (intermission_time) {
- timer = seconds_tostring(max(0, floor(intermission_time - STAT(GAMESTARTTIME))));
- } else if (warmup_stage && warmup_timeleft >= 60) {
- timer = _("WARMUP");
- } else if (autocvar_hud_panel_timer_increment || (!warmup_stage && timelimit == 0) || (warmup_stage && warmup_timeleft <= 0)) {
- if (time < STAT(GAMESTARTTIME))
- if (autocvar_hud_panel_timer_unbound){
- timer = seconds_tostring(-(STAT(GAMESTARTTIME) - time));
- } else {
- timer = seconds_tostring(0); //while restart is still active, show 00:00
- }
+ 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 = seconds_tostring(floor(time - STAT(GAMESTARTTIME)));
- } else {
- if(warmup_stage)
- timer = seconds_tostring(warmup_timeleft);
+ 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 = 0;
else
- timer = seconds_tostring(timeleft);
+ timer = floor(time - STAT(GAMESTARTTIME));
+ } else {
+ // Time left timer
+ if(warmup_stage) {
+ if(warmup_timeleft <= 0)
+ timer = floor(timelimit * 60);
+ else
+ timer = warmup_timeleft;
+ } else {
+ timer = timeleft;
+ }
+ }
+
+ if(warmup_stage)
+ timer_sub = "Warmup";
+ else if(overtimes == 1)
+ timer_sub = "Overtime";
+ else if (overtimes > 1)
+ timer_sub = sprintf("Overtime #%d", overtimes);
+
+ drawstring_aspect(pos, seconds_tostring(timer), mySize, timer_color, panel_fg_alpha, DRAWFLAG_NORMAL);
+
+ if(timer_sub != "") {
+ pos.y += mySize.y;
+ mySize.y = mySize.y / 2;
+ drawstring_aspect(pos, timer_sub, mySize, '1 0 0', panel_fg_alpha, DRAWFLAG_NORMAL);
}
-
- drawstring_aspect(pos, timer, mySize, timer_color, panel_fg_alpha, DRAWFLAG_NORMAL);
draw_endBoldFont();
}