X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fpressedkeys.qc;h=b4da1dd7d69ce1e867524405b8dd53f9ecd6f0ce;hb=b8b9d9d6006669f36c9c9a7387506242a2955904;hp=9989c4fc847dfb740281c798eb229dac5aa24b7d;hpb=632c547367cea91f7df73f4af95d79556dbc83d4;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/hud/panel/pressedkeys.qc b/qcsrc/client/hud/panel/pressedkeys.qc index 9989c4fc8..b4da1dd7d 100644 --- a/qcsrc/client/hud/panel/pressedkeys.qc +++ b/qcsrc/client/hud/panel/pressedkeys.qc @@ -1,5 +1,11 @@ #include "pressedkeys.qh" -/** Draw pressed keys (#11) */ + +#include +#include +#include + +// Pressed keys (#11) + void HUD_PressedKeys() { if(!autocvar__hud_configure) @@ -8,13 +14,16 @@ void HUD_PressedKeys() if(spectatee_status <= 0 && autocvar_hud_panel_pressedkeys < 2) return; } - HUD_Panel_UpdateCvars(); + HUD_Panel_LoadCvars(); vector pos, mySize; pos = panel_pos; mySize = panel_size; - HUD_Scale_Enable(); - HUD_Panel_DrawBg(1); + if (autocvar_hud_panel_pressedkeys_dynamichud) + HUD_Scale_Enable(); + else + HUD_Scale_Disable(); + HUD_Panel_DrawBg(); if(panel_bg_padding) { pos += '1 1 0' * panel_bg_padding; @@ -43,8 +52,7 @@ void HUD_PressedKeys() mySize = newSize; } - vector keysize; - keysize = eX * mySize.x * (1/3.0) + eY * mySize.y * (1/(3.0 - !autocvar_hud_panel_pressedkeys_attack)); + vector keysize = vec2(mySize.x / 3, mySize.y / (3 - !autocvar_hud_panel_pressedkeys_attack)); int pressedkeys = STAT(PRESSED_KEYS); if(autocvar_hud_panel_pressedkeys_attack)