X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Ftimer.qc;h=e01aa751757e3087b25038cdac422e6b162c4049;hp=fab0392dc08938d19dd27046faf608e9f1241931;hb=93afc08b09294e6dea4d0c98ce5226fdee9d1c92;hpb=06bf8b3259ecb57a7264e04deeb1b1f3656b87fd

diff --git a/qcsrc/client/hud/panel/timer.qc b/qcsrc/client/hud/panel/timer.qc
index fab0392dc0..e01aa75175 100644
--- a/qcsrc/client/hud/panel/timer.qc
+++ b/qcsrc/client/hud/panel/timer.qc
@@ -1,5 +1,9 @@
 #include "timer.qh"
 
+#include <client/autocvars.qh>
+#include <client/defs.qh>
+#include <client/miscfunctions.qh>
+
 // Timer (#5)
 
 void HUD_Timer()
@@ -50,15 +54,17 @@ void HUD_Timer()
 	}
 
 	vector timer_color;
-	if(gameover_time || minutesLeft >= 5 || warmup_stage || timelimit == 0)
+	if(intermission_time || minutesLeft >= 5 || warmup_stage || timelimit == 0)
 		timer_color = '1 1 1'; //white
 	else if(minutesLeft >= 1)
 		timer_color = '1 1 0'; //yellow
 	else
 		timer_color = '1 0 0'; //red
 
-	if (gameover_time) {
-		timer = seconds_tostring(max(0, floor(gameover_time - STAT(GAMESTARTTIME))));
+	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