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=f709b41ec9ba7909f93ab01357a56e7b7fbfc26e;hb=93afc08b09294e6dea4d0c98ce5226fdee9d1c92;hpb=96f40ca69036b7c38be9fde04fd73b94bfcca761

diff --git a/qcsrc/client/hud/panel/timer.qc b/qcsrc/client/hud/panel/timer.qc
index f709b41ec9..e01aa75175 100644
--- a/qcsrc/client/hud/panel/timer.qc
+++ b/qcsrc/client/hud/panel/timer.qc
@@ -1,3 +1,11 @@
+#include "timer.qh"
+
+#include <client/autocvars.qh>
+#include <client/defs.qh>
+#include <client/miscfunctions.qh>
+
+// Timer (#5)
+
 void HUD_Timer()
 {
 	if(!autocvar__hud_configure)
@@ -5,7 +13,7 @@ void HUD_Timer()
 		if(!autocvar_hud_panel_timer) return;
 	}
 
-	HUD_Panel_UpdateCvars();
+	HUD_Panel_LoadCvars();
 
 	draw_beginBoldFont();
 
@@ -13,7 +21,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;
@@ -21,33 +33,48 @@ void HUD_Timer()
 	}
 
 	string timer;
-	float timelimit, elapsedTime, timeleft, minutesLeft;
+	float timelimit, timeleft, minutesLeft;
 
-	timelimit = getstatf(STAT_TIMELIMIT);
+	timelimit = STAT(TIMELIMIT);
 
 	timeleft = max(0, timelimit * 60 + STAT(GAMESTARTTIME) - time);
 	timeleft = ceil(timeleft);
 
 	minutesLeft = floor(timeleft / 60);
 
+	float warmup_timeleft = 0;
+	if(warmup_stage)
+	{
+		float warmup_timelimit = STAT(WARMUP_TIMELIMIT);
+		if(warmup_timelimit > 0)
+			warmup_timeleft = max(0, warmup_timelimit - time);
+		else if(warmup_timelimit == 0)
+			warmup_timeleft = timeleft;
+		warmup_timeleft = ceil(warmup_timeleft);
+	}
+
 	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 || timelimit == 0 || warmup_stage) {
-		if (time < STAT(GAMESTARTTIME)) {
-			//while restart is still active, show 00:00
-			timer = seconds_tostring(0);
-		} else {
-			elapsedTime = floor(time - STAT(GAMESTARTTIME)); //127
-			timer = seconds_tostring(elapsedTime);
-		}
+	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
+		else
+			timer = seconds_tostring(floor(time - STAT(GAMESTARTTIME)));
 	} else {
-		timer = seconds_tostring(timeleft);
+		if(warmup_stage)
+			timer = seconds_tostring(warmup_timeleft);
+		else
+			timer = seconds_tostring(timeleft);
 	}
 
 	drawstring_aspect(pos, timer, mySize, timer_color, panel_fg_alpha, DRAWFLAG_NORMAL);