From: Mario <mario@smbclan.net>
Date: Sat, 22 Sep 2018 05:36:38 +0000 (+1000)
Subject: During warmup stage, show WARMUP instead of a timer, but restore the timer 1 minute... 
X-Git-Tag: xonotic-v0.8.5~1829^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c75400bc23770361923ba88e48fe375e9e31d542;p=xonotic%2Fxonotic-data.pk3dir.git

During warmup stage, show WARMUP instead of a timer, but restore the timer 1 minute before the match starts
---

diff --git a/qcsrc/client/hud/panel/timer.qc b/qcsrc/client/hud/panel/timer.qc
index 0dcbb70db..10d10c45d 100644
--- a/qcsrc/client/hud/panel/timer.qc
+++ b/qcsrc/client/hud/panel/timer.qc
@@ -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))