libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 16:39:43 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

input_state - cleanup

Browse Source
This commit is contained in:
twinaphex 2019-07-16 12:47:55 +02:00
parent 31426b00b9
commit 61c49a025e
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
retroarch.c
View File

@ -7737,22 +7737,23 @@ static int16_t input_state(unsigned port, unsigned device,
current_input_data, joypad_info,
libretro_input_binds, port, device, idx, id);
if ( (device == RETRO_DEVICE_JOYPAD) &&
(id == RETRO_DEVICE_ID_JOYPAD_MASK))
{
unsigned i;
if ( !input_driver_flushing_input
&& !input_driver_block_libretro_input)
{
for (i = 0; i < RARCH_FIRST_CUSTOM_BIND; i++)
if (input_state_device(ret, port, device, idx, i, true))
result |= (1 << i);
}
}
else if ( !input_driver_flushing_input
if ( !input_driver_flushing_input
&& !input_driver_block_libretro_input)
result = input_state_device(ret, port, device, idx, id, false);
{
if ( (device == RETRO_DEVICE_JOYPAD) &&
(id == RETRO_DEVICE_ID_JOYPAD_MASK))
{
unsigned i;
{
for (i = 0; i < RARCH_FIRST_CUSTOM_BIND; i++)
if (input_state_device(ret, port, device, idx, i, true))
result |= (1 << i);
}
}
else
result = input_state_device(ret, port, device, idx, id, false);
}
if (BSV_MOVIE_IS_PLAYBACK_OFF())
{