]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
During warmup stage, show WARMUP instead of a timer, but restore the timer 1 minute...
authorMario <mario@smbclan.net>
Sat, 22 Sep 2018 05:36:38 +0000 (15:36 +1000)
committerMario <mario@smbclan.net>
Sat, 22 Sep 2018 05:36:38 +0000 (15:36 +1000)
qcsrc/client/hud/panel/timer.qc

index 0dcbb70dba3cfe067d51160d74b2c26d8be70196..10d10c45ddac1ba180958bd022d44725b8832242 100644 (file)
@@ -61,7 +61,9 @@ void HUD_Timer()
        else
                timer_color = '1 0 0'; //red
 
-       if (intermission_time) {
+       if (warmup_stage && warmup_timeleft >= 60) {
+               timer = _("WARMUP");
+       } else if (intermission_time) {
                timer = seconds_tostring(max(0, floor(intermission_time - STAT(GAMESTARTTIME))));
        } else if (autocvar_hud_panel_timer_increment || (!warmup_stage && timelimit == 0) || (warmup_stage && warmup_timeleft <= 0)) {
                if (time < STAT(GAMESTARTTIME))