Clean up and improve HUD_Get_Num_Color so that it can be used by crosshair_color_spec...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud / panel / engineinfo.qc

diff --git a/qcsrc/client/hud/panel/engineinfo.qc b/qcsrc/client/hud/panel/engineinfo.qc
index ea136a21489abd1c111b457ec27855cd23a673fc..85d4259778d1598d1c0204fe0322596bd004c20f 100644 (file)
--- a/qcsrc/client/hud/panel/engineinfo.qc
+++ b/qcsrc/client/hud/panel/engineinfo.qc
@@ -1,5 +1,14 @@
 #include "engineinfo.qh"
-// Engine info panel (#13)
+
+#include <client/autocvars.qh>
+#include <client/miscfunctions.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;
@@ -18,12 +27,16 @@ 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;
@@ -59,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);
 }