mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 18:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "input_keys_pressed - start splitting up big for loop into"

Browse Source 
This reverts commit a564ac0701f7ee785458cd3bdae5f39d4017295d.
This commit is contained in:
twinaphex 2016-10-22 16:23:06 +02:00
parent 5d36ccc60e
commit ba6ae50e70
1 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
input/input_driver.c
View File

@ -617,7 +617,6 @@ void state_tracker_update_input(uint16_t *input1, uint16_t *input2)
retro_input_t input_keys_pressed(void)
{
unsigned i;
bool states[RARCH_BIND_LIST_END];
retro_input_t ret;
ret.type = 0;
@ -633,50 +632,38 @@ retro_input_t input_keys_pressed(void)
else
input_driver_block_libretro_input = false;
if (current_input->key_pressed)
for (i = 0; i < RARCH_BIND_LIST_END; i++)
{
for (i = 0; i < RARCH_BIND_LIST_END; i++)
{
if ((!input_driver_block_libretro_input && ((i < RARCH_FIRST_META_KEY)))
|| !input_driver_block_hotkey)
states[i] = current_input->key_pressed(current_input_data, i);
}
}
bool state = false;
if (((!input_driver_block_libretro_input && ((i < RARCH_FIRST_META_KEY)))
|| !input_driver_block_hotkey) && current_input->key_pressed)
state = current_input->key_pressed(current_input_data, i);
if (i >= RARCH_FIRST_META_KEY)
state |= current_input->meta_key_pressed(current_input_data, i);
#ifdef HAVE_OVERLAY
for (i = 0; i < RARCH_BIND_LIST_END; i++)
states[i] |= input_overlay_key_pressed(i);
state |= input_overlay_key_pressed(i);
#endif
#ifdef HAVE_COMMAND
if (input_driver_command)
{
for (i = 0; i < RARCH_BIND_LIST_END; i++)
if (input_driver_command)
{
command_handle_t handle;
handle.handle = input_driver_command;
handle.id = i;
states[i] |= command_get(&handle);
state |= command_get(&handle);
}
}
#endif
#ifdef HAVE_NETWORKGAMEPAD
if (input_driver_remote)
{
for (i = 0; i < RARCH_BIND_LIST_END; i++)
states[i] |= input_remote_key_pressed(i, 0);
}
if (input_driver_remote)
state |= input_remote_key_pressed(i, 0);
#endif
for (i = RARCH_FIRST_META_KEY; i < RARCH_BIND_LIST_END; i++)
states[i] |= current_input->meta_key_pressed(current_input_data, i);
for (i = 0; i < RARCH_BIND_LIST_END; i++)
{
if (states[i])
if (state)
ret.state |= (UINT64_C(1) << i);
}