From e54ebaa4968fa6546501ea068b80e8e53f753c3b Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 22 Sep 2018 15:39:40 +1000 Subject: [PATCH] On second thought, don't override the intermission timer with the warmup text --- qcsrc/client/hud/panel/timer.qc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qcsrc/client/hud/panel/timer.qc b/qcsrc/client/hud/panel/timer.qc index 10d10c45d..e01aa7517 100644 --- a/qcsrc/client/hud/panel/timer.qc +++ b/qcsrc/client/hud/panel/timer.qc @@ -61,10 +61,10 @@ void HUD_Timer() else timer_color = '1 0 0'; //red - if (warmup_stage && warmup_timeleft >= 60) { - timer = _("WARMUP"); - } else if (intermission_time) { + 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)) timer = seconds_tostring(0); //while restart is still active, show 00:00 -- 2.39.2