From: z411 <z411@omaera.org>
Date: Sat, 9 Apr 2022 01:01:47 +0000 (-0400)
Subject: Lock timer in infinite warmup
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=798623658e17df50eaf50f724a6af513ffddfc71;p=xonotic%2Fxonotic-data.pk3dir.git

Lock timer in infinite warmup
---

diff --git a/qcsrc/client/hud/panel/timer.qc b/qcsrc/client/hud/panel/timer.qc
index 51095ae1a..ccbfabc20 100644
--- a/qcsrc/client/hud/panel/timer.qc
+++ b/qcsrc/client/hud/panel/timer.qc
@@ -116,10 +116,21 @@ void HUD_Timer()
 	}
 
 	// Timer text
-	if (autocvar_hud_panel_timer_increment || timelimit <= 0)
-		timer = seconds_tostring(HUD_Timer_TimeElapsed(curtime, STAT(GAMESTARTTIME)));
+	if (warmup_stage && timelimit == -1)
+	{
+		// Lock timer in infinite warmup
+		if (autocvar_hud_panel_timer_increment)
+			timer = seconds_tostring(0);
+		else
+			timer = seconds_tostring(STAT(TIMELIMIT) * 60);
+	}
 	else
-		timer = seconds_tostring(timeleft);
+	{
+		if (autocvar_hud_panel_timer_increment || timelimit <= 0)
+			timer = seconds_tostring(HUD_Timer_TimeElapsed(curtime, STAT(GAMESTARTTIME)));
+		else
+			timer = seconds_tostring(timeleft);
+	}
 
 	// Secondary timer for round-based game modes
 	if(STAT(ROUNDSTARTTIME) && autocvar_hud_panel_timer_secondary)