mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

remap-redux part2: rename variable

Browse Source
This commit is contained in:
radius 2018-04-03 00:36:26 -05:00
parent 2415f821af
commit e42e79db28
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
input/input_driver.c
View File

@ -637,7 +637,10 @@ int16_t input_state(unsigned port, unsigned device,
unsigned idx, unsigned id) unsigned idx, unsigned id)
{ {
int16_t res = 0; int16_t res = 0;
bool clear = false;
/* used to reset input state of a button when the gamepad mapper
is in action for that button*/
bool reset_state = false;
device &= RETRO_DEVICE_MASK; device &= RETRO_DEVICE_MASK;
@ -661,7 +664,7 @@ int16_t input_state(unsigned port, unsigned device,
{ {
case RETRO_DEVICE_JOYPAD: case RETRO_DEVICE_JOYPAD:
if (id != settings->uints.input_remap_ids[port][id]) if (id != settings->uints.input_remap_ids[port][id])
clear = true; reset_state = true;
break; break;
case RETRO_DEVICE_ANALOG: case RETRO_DEVICE_ANALOG:
@ -681,7 +684,7 @@ int16_t input_state(unsigned port, unsigned device,
joypad_info.joy_idx = settings->uints.input_joypad_map[port]; joypad_info.joy_idx = settings->uints.input_joypad_map[port];
joypad_info.auto_binds = input_autoconf_binds[joypad_info.joy_idx]; joypad_info.auto_binds = input_autoconf_binds[joypad_info.joy_idx];
if (!clear) if (!reset_state)
res = current_input->input_state( res = current_input->input_state(
current_input_data, joypad_info, libretro_input_binds, port, device, idx, id); current_input_data, joypad_info, libretro_input_binds, port, device, idx, id);
else else