nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2025-02-15 16:41:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

CLIENT: Draw controller glyphs properly for bouncing betties prompt

Browse source
This commit is contained in:
Peter0x44 2024-11-30 06:30:24 +00:00
parent a9cc26679a
commit 10f32b496e
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
source/client/hud.qc
View file

@ -1198,17 +1198,27 @@ void(float width, float height) HUD_Weaponstring =
void(float width, float height) HUD_BouncingBetty = void(float width, float height) HUD_BouncingBetty =
{ {
float top_x, bot_x, but_x; float top_x, bot_x, but_x;
string betty_key; string betty_key = "";
string betty_space = ""; string betty_space = "";
string activate_string, activate_string2; string activate_string, activate_string2;
tokenize(findkeysforcommandex("impulse 33")); float argc = tokenize(findkeysforcommandex("impulse 33"));
betty_key = strtoupper(argv(0));
for (int i = 0; i < argc; ++i)
{
betty_key = strtoupper(argv(i));
float bind_is_gamepad = Key_IsControllerGlyph(betty_key);
if (bind_is_gamepad && last_input_was_gamepad)
break;
else if (!bind_is_gamepad && !last_input_was_gamepad)
break;
}
// If this is a gamepad button, the space we want to reserve // If this is a gamepad button, the space we want to reserve
// in the betty string should be a fixed width. // in the betty string should be a fixed width.
if (Key_IsControllerGlyph(betty_key)) { if (Key_IsControllerGlyph(betty_key)) {
betty_space = " "; betty_space = " ";
} }
// Scale the space in the betty string for the bind according to // Scale the space in the betty string for the bind according to
// the bind's name. // the bind's name.
@ -1231,7 +1241,7 @@ void(float width, float height) HUD_BouncingBetty =
but_x = top_x + getTextWidth("Press ", 12); but_x = top_x + getTextWidth("Press ", 12);
if (Key_IsControllerGlyph(betty_key)) if (Key_IsControllerGlyph(betty_key))
Key_DrawControllerGlyph([but_x - 5, g_height - 308], betty_key, [22, 22]); Key_DrawControllerGlyph([but_x - 5, g_height - 308], betty_key, [18, 18]);
else else
Draw_String([but_x, g_height - 303], betty_key, [12, 12], [1, 1, 0], 1, 0); Draw_String([but_x, g_height - 303], betty_key, [12, 12], [1, 1, 0], 1, 0);
} }