nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2025-04-05 17:33:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

CLIENT/MENU: Fix incorrect bind being printed on interface

Browse source
This commit is contained in:
MotoLegacy 2025-02-07 22:44:49 -08:00
parent de012d4109
commit 3f39571d4d
3 changed files with 40 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
source/client/hud.qc
View file

@ -981,13 +981,14 @@ void() HUD_Useprint =
float argc = tokenize(findkeysforcommandex("+button7"));
for (int i = 0; i < argc; i++) {
usebutton = strtoupper(argv(i));
float bind_is_gamepad = Key_IsControllerGlyph(usebutton);
string temp_button = strtoupper(argv(i));
float bind_is_gamepad = Key_IsControllerGlyph(temp_button);
// Always display the last button in the last.
if (bind_is_gamepad && last_input_was_gamepad)
break;
usebutton = temp_button;
else if (!bind_is_gamepad && !last_input_was_gamepad)
break;
usebutton = temp_button;
}
if (usebutton == "")
@ -1273,16 +1274,16 @@ void() HUD_BouncingBetty =
float argc = tokenize(findkeysforcommandex("impulse 33"));
for (int i = 0; i < argc; ++i)
{
betty_key = strtoupper(argv(i));
float bind_is_gamepad = Key_IsControllerGlyph(betty_key);
for (int i = 0; i < argc; i++) {
string temp_button = strtoupper(argv(i));
float bind_is_gamepad = Key_IsControllerGlyph(temp_button);
if (bind_is_gamepad && last_input_was_gamepad)
break;
else if (!bind_is_gamepad && !last_input_was_gamepad)
break;
}
// Always display the last button in the last.
if (bind_is_gamepad && last_input_was_gamepad)
betty_key = temp_button;
else if (!bind_is_gamepad && !last_input_was_gamepad)
betty_key = temp_button;
}
// If this is a gamepad button, the space we want to reserve
// in the betty string should be a fixed width.
@ -1401,13 +1402,14 @@ void() HUD_Crosshair =
float argc = tokenize(findkeysforcommandex("impulse 23"));
for (int i = 0; i < argc; i++) {
breath_button = strtoupper(argv(i));
float bind_is_gamepad = Key_IsControllerGlyph(breath_button);
string temp_button = strtoupper(argv(i));
float bind_is_gamepad = Key_IsControllerGlyph(temp_button);
if (bind_is_gamepad && last_input_was_gamepad)
break;
else if (!bind_is_gamepad && !last_input_was_gamepad)
break;
// Always display the last button in the last.
if (bind_is_gamepad && last_input_was_gamepad)
breath_button = temp_button;
else if (!bind_is_gamepad && !last_input_was_gamepad)
breath_button = temp_button;
}
if (breath_button == "")
@ -1917,15 +1919,16 @@ void(float x_position, float y_position, string command, string action) HUD_Draw
float argc = tokenize(findkeysforcommandex(command));
for (int i = 0; i < argc; i++) {
bind_button = strtoupper(argv(i));
float bind_is_gamepad = Key_IsControllerGlyph(bind_button);
for (int i = 0; i < argc; i++) {
string temp_button = strtoupper(argv(i));
float bind_is_gamepad = Key_IsControllerGlyph(temp_button);
if (bind_is_gamepad && last_input_was_gamepad)
break;
else if (!bind_is_gamepad && !last_input_was_gamepad)
break;
}
// Always display the last button in the last.
if (bind_is_gamepad && last_input_was_gamepad)
bind_button = temp_button;
else if (!bind_is_gamepad && !last_input_was_gamepad)
bind_button = temp_button;
}
if (bind_button == "")
bind_button = "UNBOUND";

18
source/menu/menu_bind.qc
View file

@ -3,7 +3,7 @@ string menu_bind_buttons[13] = {"bm_jump", "bm_spri", "bm_crou", "bm_wnex", "bm_
float(float keynum) Menu_Bindings_IsGamepad =
{
if (keynum >= 816 && keynum <= 839)
if (keynum >= 768 && keynum <= 839)
return true;
return false;
@ -19,16 +19,16 @@ void(float order, string command) Menu_Bindings_PrintBindForCommand =
string bind = "";
float argc = tokenize(findkeysforcommandex(command));
for (int i = 0; i < argc; i++) {
bind = strtoupper(argv(i));
float bind_is_gamepad = Menu_Bindings_IsGamepad(stringtokeynum(bind));
string temp_button = strtoupper(argv(i));
float bind_is_gamepad = Menu_Bindings_IsGamepad(stringtokeynum(temp_button));
if (bind_is_gamepad && last_input_was_gamepad)
break;
else if (!bind_is_gamepad && !last_input_was_gamepad)
break;
}
// Always display the last button in the last.
if (bind_is_gamepad && last_input_was_gamepad)
bind = temp_button;
else if (!bind_is_gamepad && !last_input_was_gamepad)
bind = temp_button;
}
if (bind == "")
bind = "UNBOUND";

1
source/menu/sui_sys.qc
View file

@ -784,6 +784,7 @@ void(float scan, string command) _sui_do_keybind =
}
string keyname = keynumtostring(scan);
_sui_unbind(command);
localcmd(sprintf("unbind %s\n", keyname));
localcmd(sprintf("bind %s %s\n", keyname, command));
_sui_binding_command = "";
_sui_binding_command_name = "";