On second thought, don't override the intermission timer with the warmup text 598/head
authorMario <mario@smbclan.net>
Sat, 22 Sep 2018 05:39:40 +0000 (15:39 +1000)
committerMario <mario@smbclan.net>
Sat, 22 Sep 2018 05:39:40 +0000 (15:39 +1000)
qcsrc/client/hud/panel/timer.qc

index 10d10c45ddac1ba180958bd022d44725b8832242..e01aa751757e3087b25038cdac422e6b162c4049 100644 (file)
@@ -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