mirror of
https://github.com/libretro/RetroArch
synced 2025-04-01 04:20:27 +00:00
input_state - cleanup
This commit is contained in:
parent
31426b00b9
commit
61c49a025e
31
retroarch.c
31
retroarch.c
@ -7737,22 +7737,23 @@ static int16_t input_state(unsigned port, unsigned device,
|
|||||||
current_input_data, joypad_info,
|
current_input_data, joypad_info,
|
||||||
libretro_input_binds, port, device, idx, id);
|
libretro_input_binds, port, device, idx, id);
|
||||||
|
|
||||||
if ( (device == RETRO_DEVICE_JOYPAD) &&
|
if ( !input_driver_flushing_input
|
||||||
(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
|
|
||||||
&& !input_driver_block_libretro_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())
|
if (BSV_MOVIE_IS_PLAYBACK_OFF())
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user