X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fengineinfo.qc;h=41fdb3a5bbf3985c0a8401287d3dc3fe2a5d6fec;hb=795f0b946159ae455d605cd1d3acc667d6d70d7b;hp=1a22c54e8420bb4d4c951541e49347939d420521;hpb=2487070c23bdcfc8ac60d414356ec43f52ec1a57;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud/panel/engineinfo.qc b/qcsrc/client/hud/panel/engineinfo.qc
index 1a22c54e8..41fdb3a5b 100644
--- a/qcsrc/client/hud/panel/engineinfo.qc
+++ b/qcsrc/client/hud/panel/engineinfo.qc
@@ -1,4 +1,14 @@
-// Engine info panel (#13)
+#include "engineinfo.qh"
+
+#include <client/autocvars.qh>
+#include <client/draw.qh>
+
+// Engine info (#13)
+
+void HUD_EngineInfo_Export(int fh)
+{
+	// allow saving cvars that aesthetically change the panel into hud skin files
+}
 
 float prevfps;
 float prevfps_time;
@@ -17,19 +27,23 @@ void HUD_EngineInfo()
 		if(!autocvar_hud_panel_engineinfo) return;
 	}
 
-	HUD_Panel_UpdateCvars();
+	HUD_Panel_LoadCvars();
 	vector pos, mySize;
 	pos = panel_pos;
 	mySize = panel_size;
 
-	HUD_Panel_DrawBg(1);
+	if (autocvar_hud_panel_engineinfo_dynamichud)
+		HUD_Scale_Enable();
+	else
+		HUD_Scale_Disable();
+	HUD_Panel_DrawBg();
 	if(panel_bg_padding)
 	{
 		pos += '1 1 0' * panel_bg_padding;
 		mySize -= '2 2 0' * panel_bg_padding;
 	}
 
-	float currentTime = gettime(GETTIME_REALTIME);
+	float currentTime = gettime(GETTIME_FRAMESTART);
 	if(autocvar_hud_panel_engineinfo_framecounter_exponentialmovingaverage)
 	{
 		float currentframetime = currentTime - prevfps_time;
@@ -58,7 +72,6 @@ void HUD_EngineInfo()
 		}
 	}
 
-	vector color;
-	color = HUD_Get_Num_Color (prevfps, 100);
+	vector color = HUD_Get_Num_Color(prevfps, 100, true);
 	drawstring_aspect(pos, sprintf(_("FPS: %.*f"), autocvar_hud_panel_engineinfo_framecounter_decimals, prevfps), mySize, color, panel_fg_alpha, DRAWFLAG_NORMAL);
 }