mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-21 09:39:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

input_state - cleanup

Browse Source
This commit is contained in:
twinaphex 2015-08-06 03:10:52 +02:00
parent d279b158c9
commit 0595393cc0
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libretro_version_1.c
View File

@ -156,7 +156,7 @@ static int16_t input_state(unsigned port, unsigned device,
if (settings->input.remap_binds_enable) if (settings->input.remap_binds_enable)
input_remapping_state(port, &device, &idx, &id); input_remapping_state(port, &device, &idx, &id);
if (!driver->block_libretro_input) if (!driver->flushing_input && !driver->block_libretro_input)
{ {
if (((id < RARCH_FIRST_META_KEY) || (device == RETRO_DEVICE_KEYBOARD))) if (((id < RARCH_FIRST_META_KEY) || (device == RETRO_DEVICE_KEYBOARD)))
res = input->input_state(driver->input_data, libretro_input_binds, port, device, idx, id); res = input->input_state(driver->input_data, libretro_input_binds, port, device, idx, id);
@ -166,10 +166,6 @@ static int16_t input_state(unsigned port, unsigned device,
#endif #endif
} }
/* flushing_input will be cleared in rarch_main_iterate. */
if (driver->flushing_input)
res = 0;
/* Don't allow turbo for D-pad. */ /* Don't allow turbo for D-pad. */
if (device == RETRO_DEVICE_JOYPAD && (id < RETRO_DEVICE_ID_JOYPAD_UP || if (device == RETRO_DEVICE_JOYPAD && (id < RETRO_DEVICE_ID_JOYPAD_UP ||
id > RETRO_DEVICE_ID_JOYPAD_RIGHT)) id > RETRO_DEVICE_ID_JOYPAD_RIGHT))