Merge branch 'master' into Mario/fullbright_skins

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

diff --git a/qcsrc/client/hud/panel/pressedkeys.qc b/qcsrc/client/hud/panel/pressedkeys.qc
index 94cc3287799e2833aa76598a2a1c8b78cdc18ffc..d0a4f39fdfd8fc956ce202376af7f5b55f90ac17 100644 (file)
--- a/qcsrc/client/hud/panel/pressedkeys.qc
+++ b/qcsrc/client/hud/panel/pressedkeys.qc
@@ -1,3 +1,4 @@
+#include "pressedkeys.qh"
 /** Draw pressed keys (#11) */
 void HUD_PressedKeys()
 {
@@ -12,6 +13,10 @@ void HUD_PressedKeys()
        pos = panel_pos;
        mySize = panel_size;
 
+       if (autocvar_hud_panel_pressedkeys_dynamichud)
+               HUD_Scale_Enable();
+       else
+               HUD_Scale_Disable();
        HUD_Panel_DrawBg(1);
        if(panel_bg_padding)
        {
@@ -43,8 +48,7 @@ void HUD_PressedKeys()
 
        vector keysize;
        keysize = eX * mySize.x * (1/3.0) + eY * mySize.y * (1/(3.0 - !autocvar_hud_panel_pressedkeys_attack));
-       float pressedkeys;
-       pressedkeys = getstatf(STAT_PRESSED_KEYS);
+       int pressedkeys = STAT(PRESSED_KEYS);
 
        if(autocvar_hud_panel_pressedkeys_attack)
        {