mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-02 19:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Analog button mapping fixes (#13913)

Browse Source
This commit is contained in:
jdgleaver 2022-05-05 19:47:23 +01:00 committed by GitHub
parent 0a52964015
commit dbcce3f564
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
input/input_driver.c
View File

@ -3919,6 +3919,7 @@ int16_t input_state_device(
if (input_st->overlay_ptr &&
input_st->overlay_ptr->alive &&
(port == 0) &&
(idx != RETRO_DEVICE_INDEX_ANALOG_BUTTON) &&
!(((input_analog_dpad_mode == ANALOG_DPAD_LSTICK) &&
(idx == RETRO_DEVICE_INDEX_ANALOG_LEFT)) ||
((input_analog_dpad_mode == ANALOG_DPAD_RSTICK) &&
@ -4939,7 +4940,14 @@ int16_t input_state_internal(unsigned port, unsigned device,
{
if (id < RARCH_FIRST_CUSTOM_BIND)
{
bool valid_bind = (*input_st->libretro_input_binds[mapped_port])[id].valid;
/* TODO/FIXME: Analog buttons can only be read as analog
* when the default mapping is applied. If the user
* remaps any analog buttons, they will become 'digital'
* due to the way that mapping is handled elsewhere. We
* cannot fix this without rewriting the entire mess that
* is the input remapping system... */
bool valid_bind = (*input_st->libretro_input_binds[mapped_port])[id].valid &&
(id == settings->uints.input_remap_ids[mapped_port][id]);
if (valid_bind)
{