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

Cleanup - input_key_pressed

Browse Source
This commit is contained in:
twinaphex 2017-12-18 06:14:48 +01:00
parent 69f85556a3
commit 422ce9396c
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
input/input_driver.c
View File

@ -1078,6 +1078,8 @@ void input_keys_pressed(void *data, retro_bits_t* p_new_state)
for (i = 0; i < RARCH_BIND_LIST_END; i++) for (i = 0; i < RARCH_BIND_LIST_END; i++)
{ {
bool bit_pressed = false;
if ( if (
((!input_driver_block_libretro_input && ((i < RARCH_FIRST_META_KEY))) ((!input_driver_block_libretro_input && ((i < RARCH_FIRST_META_KEY)))
|| !input_driver_block_hotkey) && || !input_driver_block_hotkey) &&
@ -1085,19 +1087,15 @@ void input_keys_pressed(void *data, retro_bits_t* p_new_state)
joypad_info, &binds, joypad_info, &binds,
0, RETRO_DEVICE_JOYPAD, 0, i) 0, RETRO_DEVICE_JOYPAD, 0, i)
) )
{ bit_pressed = true;
BIT256_SET_PTR(p_new_state, i);
return;
}
if (input_keys_pressed_iterate(i, p_new_state)) if (bit_pressed || input_keys_pressed_iterate(i, p_new_state))
{ {
BIT256_SET_PTR(p_new_state, i); BIT256_SET_PTR(p_new_state, i);
} }
} }
} }
void *input_driver_get_data(void) void *input_driver_get_data(void)
{ {
return current_input_data; return current_input_data;