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

Simplify input_keys_pressed

Browse Source
This commit is contained in:
twinaphex 2021-04-10 18:25:50 +02:00
parent 5df321fcaa
commit 372f939cc9
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
retroarch.c
View File

@ -24618,29 +24618,20 @@ static void input_keys_pressed(
} }
} }
/* Check the libretro input first */
if (p_rarch->input_driver_block_libretro_input)
{ {
for (i = 0; i < RARCH_FIRST_META_KEY; i++) int16_t ret = 0;
{
if (input_keys_pressed_other_sources(p_rarch, /* Check the libretro input first */
i, p_new_state)) if (!p_rarch->input_driver_block_libretro_input)
{ ret = input_state_wrap(
BIT256_SET_PTR(p_new_state, i); p_rarch->current_input,
} p_rarch->current_input_data,
} p_rarch->joypad,
} sec_joypad,
else joypad_info, &binds[port],
{ p_rarch->keyboard_mapping_blocked,
int16_t ret = input_state_wrap( port, RETRO_DEVICE_JOYPAD, 0,
p_rarch->current_input, RETRO_DEVICE_ID_JOYPAD_MASK);
p_rarch->current_input_data,
p_rarch->joypad,
sec_joypad,
joypad_info, &binds[port],
p_rarch->keyboard_mapping_blocked,
port, RETRO_DEVICE_JOYPAD, 0,
RETRO_DEVICE_ID_JOYPAD_MASK);
for (i = 0; i < RARCH_FIRST_META_KEY; i++) for (i = 0; i < RARCH_FIRST_META_KEY; i++)
{ {