From: bones_was_here <bones_was_here@xonotic.au>
Date: Tue, 13 Dec 2022 05:14:43 +0000 (+1000)
Subject: Support multi-stage warmups in Announcer_Time()
X-Git-Tag: xonotic-v0.8.6~179^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bf7f5c0b22733002fbde9ac642ef3d9b9274aba0;p=xonotic%2Fxonotic-data.pk3dir.git

Support multi-stage warmups in Announcer_Time()
---

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index 70834c509..077a1c6d0 100644
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -214,7 +214,7 @@ void Announcer_Time()
 	{
 		float warmup_timelimit = STAT(WARMUP_TIMELIMIT);
 		if(warmup_timelimit > 0)
-			timeleft = max(0, warmup_timelimit - time);
+			timeleft = max(0, warmup_timelimit + starttime - time);
 		else
 			timeleft = 0;
 	}