From: Mario <mario@smbclan.net>
Date: Sat, 22 Sep 2018 05:39:40 +0000 (+1000)
Subject: On second thought, don't override the intermission timer with the warmup text
X-Git-Tag: xonotic-v0.8.5~1829^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F598%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

On second thought, don't override the intermission timer with the warmup text
---

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