ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify input_menu_keys_pressed

This commit is contained in:
twinaphex 2016-10-27 06:49:18 +02:00
parent 8f30b3e706
commit 660f021dbc
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
input/input_driver.c
View File

@ -694,26 +694,24 @@ uint64_t input_menu_keys_pressed(void)
for (i = 0; i < RARCH_BIND_LIST_END; i++) for (i = 0; i < RARCH_BIND_LIST_END; i++)
{ {
bool state = false; bool state = false;
#if 0 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) && current_input->key_pressed) || !input_driver_block_hotkey) && current_input->key_pressed)
#if 1
&& settings->input.binds[0][i].valid
#endif
)
{
#if 1
state = input_joypad_pressed(input_driver_get_joypad_driver(),
0, settings->input.binds[0], i);
#else
state = current_input->key_pressed(current_input_data, i); state = current_input->key_pressed(current_input_data, i);
#endif
}
if (i >= RARCH_FIRST_META_KEY) if (i >= RARCH_FIRST_META_KEY)
state |= current_input->meta_key_pressed(current_input_data, i); state |= current_input->meta_key_pressed(current_input_data, i);
#else
if (((((!input_driver_block_libretro_input && ((i < RARCH_FIRST_META_KEY)))
|| !input_driver_block_hotkey) && current_input->key_pressed))
&& settings->input.binds[0][i].valid)
{
state = input_joypad_pressed(input_driver_get_joypad_driver(),
0, settings->input.binds[0], i);
}
if (i >= RARCH_FIRST_META_KEY && settings->input.binds[0][i].valid)
state |= input_joypad_pressed(input_driver_get_joypad_driver(),
0, settings->input.binds[0], i);
#endif
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
state |= input_overlay_key_pressed(i); state |= input_overlay_key_pressed(i);