X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Ftimer.qc;h=45f46b4087ad35da1c4cff70aabe9799a40463f6;hb=90b55a65862014d4147a4cc951e2c89e1139cb4e;hp=b61f3c4c177ff2b8bafa7d280167dac7b898548d;hpb=cbdb7a96d12e868b8de189ac2a93172ec7a01acb;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud/panel/timer.qc b/qcsrc/client/hud/panel/timer.qc
index b61f3c4c1..45f46b408 100644
--- a/qcsrc/client/hud/panel/timer.qc
+++ b/qcsrc/client/hud/panel/timer.qc
@@ -1,4 +1,7 @@
 #include "timer.qh"
+
+// Timer (#5)
+
 void HUD_Timer()
 {
 	if(!autocvar__hud_configure)
@@ -6,7 +9,7 @@ void HUD_Timer()
 		if(!autocvar_hud_panel_timer) return;
 	}
 
-	HUD_Panel_UpdateCvars();
+	HUD_Panel_LoadCvars();
 
 	draw_beginBoldFont();
 
@@ -14,7 +17,11 @@ void HUD_Timer()
 	pos = panel_pos;
 	mySize = panel_size;
 
-	HUD_Panel_DrawBg(1);
+	if (autocvar_hud_panel_timer_dynamichud)
+		HUD_Scale_Enable();
+	else
+		HUD_Scale_Disable();
+	HUD_Panel_DrawBg();
 	if(panel_bg_padding)
 	{
 		pos += '1 1 0' * panel_bg_padding;
@@ -22,7 +29,7 @@ void HUD_Timer()
 	}
 
 	string timer;
-	float timelimit, elapsedTime, timeleft, minutesLeft;
+	float timelimit, timeleft, minutesLeft;
 
 	timelimit = STAT(TIMELIMIT);
 
@@ -43,21 +50,20 @@ void HUD_Timer()
 	}
 
 	vector timer_color;
-	if(minutesLeft >= 5 || warmup_stage || timelimit == 0) //don't use red or yellow in warmup or when there is no timelimit
+	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 (autocvar_hud_panel_timer_increment || (!warmup_stage && timelimit == 0) || (warmup_stage && warmup_timeleft <= 0)) {
-		if (time < STAT(GAMESTARTTIME)) {
-			//while restart is still active, show 00:00
-			timer = seconds_tostring(0);
-		} else {
-			elapsedTime = floor(time - STAT(GAMESTARTTIME));
-			timer = seconds_tostring(elapsedTime);
-		}
+	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))
+			timer = seconds_tostring(0); //while restart is still active, show 00:00
+		else
+			timer = seconds_tostring(floor(time - STAT(GAMESTARTTIME)));
 	} else {
 		if(warmup_stage)
 			timer = seconds_tostring(warmup_timeleft);