X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Ftimer.qc;h=8bb4ade6a17f49aca0f69be10c5ffa303069af2f;hb=06a08d0c6b573f2562297147171aff3d990fa42d;hp=0dcbb70dba3cfe067d51160d74b2c26d8be70196;hpb=7e474d576080259e21690de30778b17029b5c0f2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud/panel/timer.qc b/qcsrc/client/hud/panel/timer.qc
index 0dcbb70db..8bb4ade6a 100644
--- a/qcsrc/client/hud/panel/timer.qc
+++ b/qcsrc/client/hud/panel/timer.qc
@@ -6,6 +6,11 @@
 
 // Timer (#5)
 
+void HUD_Timer_Export(int fh)
+{
+	// allow saving cvars that aesthetically change the panel into hud skin files
+}
+
 void HUD_Timer()
 {
 	if(!autocvar__hud_configure)
@@ -63,6 +68,8 @@ void HUD_Timer()
 
 	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