Mercurial > repos > blastem
diff bindings.c @ 2627:df6dbf229e2f
Prevent gamepad binds from firing while remapping a gamepad
| author | Michael Pavone <pavone@retrodev.com> |
|---|---|
| date | Sat, 22 Feb 2025 23:33:12 -0800 |
| parents | f4a471730ba4 |
| children | 99297d5f4c5d |
line wrap: on
line diff
--- a/bindings.c Sat Feb 22 23:11:35 2025 -0800 +++ b/bindings.c Sat Feb 22 23:33:12 2025 -0800 @@ -86,6 +86,7 @@ #define DEFAULT_JOYBUTTON_ALLOC 12 static keybinding *bindings[0x10000]; static joystick joysticks[MAX_JOYSTICKS]; +static uint8_t joystick_enabled[MAX_JOYSTICKS] = {1,1,1,1,1,1,1,1}; static mousebinding mice[MAX_MICE]; const uint8_t dpadbits[] = {RENDER_DPAD_UP, RENDER_DPAD_DOWN, RENDER_DPAD_LEFT, RENDER_DPAD_RIGHT}; @@ -205,6 +206,14 @@ content_binds_enabled = enabled; } +void bindings_set_joy_state(int joystick, uint8_t enabled) +{ + if (joystick >= MAX_JOYSTICKS || joystick < 0) { + return; + } + joystick_enabled[joystick] = enabled; +} + void handle_binding_down(keybinding * binding) { if (!current_system || !content_binds_enabled) { @@ -235,7 +244,7 @@ void handle_joydown(int joystick, int button) { - if (joystick >= MAX_JOYSTICKS || button >= joysticks[joystick].num_buttons) { + if (joystick >= MAX_JOYSTICKS || button >= joysticks[joystick].num_buttons || !joystick_enabled[joystick]) { return; } keybinding * binding = joysticks[joystick].buttons + button; @@ -515,7 +524,7 @@ void handle_joyup(int joystick, int button) { - if (joystick >= MAX_JOYSTICKS || button >= joysticks[joystick].num_buttons) { + if (joystick >= MAX_JOYSTICKS || button >= joysticks[joystick].num_buttons || !joystick_enabled[joystick]) { return; } keybinding * binding = joysticks[joystick].buttons + button; @@ -524,7 +533,7 @@ void handle_joy_dpad(int joystick, int dpadnum, uint8_t value) { - if (joystick >= MAX_JOYSTICKS || dpadnum >= joysticks[joystick].num_dpads) { + if (joystick >= MAX_JOYSTICKS || dpadnum >= joysticks[joystick].num_dpads || !joystick_enabled[joystick]) { return; } joydpad * dpad = joysticks[joystick].dpads + dpadnum; @@ -542,7 +551,7 @@ void handle_joy_axis(int joystick, int axis, int16_t value) { - if (joystick >= MAX_JOYSTICKS || axis >= joysticks[joystick].num_axes) { + if (joystick >= MAX_JOYSTICKS || axis >= joysticks[joystick].num_axes || !joystick_enabled[joystick]) { return; } joyaxis *jaxis = joysticks[joystick].axes + axis;