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

Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-10-29 04:09:50 +02:00
parent d231642856
commit 93af926f76
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
input/input_driver.c
View File

@ -682,6 +682,7 @@ uint64_t input_menu_keys_pressed(void)
unsigned i; unsigned i;
uint64_t ret = 0; uint64_t ret = 0;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
const struct retro_keybind *binds[MAX_USERS] = {NULL};
if (!current_input || !current_input_data) if (!current_input || !current_input_data)
return ret; return ret;
@ -699,14 +700,11 @@ uint64_t input_menu_keys_pressed(void)
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 && settings->input.binds[0][i].valid
#endif
) )
{ {
int port; int port;
int port_max = 1; int port_max = 1;
#if 1
if (settings->input.all_users_control_menu) if (settings->input.all_users_control_menu)
port_max = settings->input.max_users; port_max = settings->input.max_users;
@ -717,9 +715,6 @@ uint64_t input_menu_keys_pressed(void)
if (state) if (state)
break; break;
} }
#else
state = current_input->key_pressed(current_input_data, i);
#endif
} }
if (i >= RARCH_FIRST_META_KEY) if (i >= RARCH_FIRST_META_KEY)
@ -750,8 +745,6 @@ uint64_t input_menu_keys_pressed(void)
ret |= (UINT64_C(1) << i); ret |= (UINT64_C(1) << i);
} }
const struct retro_keybind *binds[MAX_USERS] = {NULL};
if (menu_input_dialog_get_display_kb()) if (menu_input_dialog_get_display_kb())
return ret; return ret;