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

Cleanups

This commit is contained in:
twinaphex 2020-06-09 19:21:25 +02:00
parent b19e83aa6d
commit 23fb0f3d4d
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
retroarch.c
View File

@ -23978,7 +23978,6 @@ static void input_menu_keys_pressed(
{ {
unsigned i, port; unsigned i, port;
settings_t *settings = p_rarch->configuration_settings; settings_t *settings = p_rarch->configuration_settings;
int input_hotkey_block_delay = settings->uints.input_hotkey_block_delay;
uint8_t max_users = (uint8_t)p_rarch->input_driver_max_users; uint8_t max_users = (uint8_t)p_rarch->input_driver_max_users;
uint8_t port_max = 1; uint8_t port_max = 1;
@ -24003,15 +24002,16 @@ static void input_menu_keys_pressed(
if (CHECK_INPUT_DRIVER_BLOCK_HOTKEY(binds_norm, binds_auto)) if (CHECK_INPUT_DRIVER_BLOCK_HOTKEY(binds_norm, binds_auto))
{ {
const struct retro_keybind *htkey = const struct retro_keybind *hotkey =
&input_config_binds[port][RARCH_ENABLE_HOTKEY]; &input_config_binds[port][RARCH_ENABLE_HOTKEY];
if (htkey->valid if (hotkey->valid
&& p_rarch->current_input->input_state( && p_rarch->current_input->input_state(
p_rarch->current_input_data, joypad_info, p_rarch->current_input_data, joypad_info,
&binds[0], port, RETRO_DEVICE_JOYPAD, 0, &binds[0], port, RETRO_DEVICE_JOYPAD, 0,
RARCH_ENABLE_HOTKEY)) RARCH_ENABLE_HOTKEY))
{ {
int input_hotkey_block_delay = settings->uints.input_hotkey_block_delay;
if (p_rarch->input_hotkey_block_counter < input_hotkey_block_delay) if (p_rarch->input_hotkey_block_counter < input_hotkey_block_delay)
p_rarch->input_hotkey_block_counter++; p_rarch->input_hotkey_block_counter++;
else else
@ -24099,8 +24099,8 @@ static void input_menu_keys_pressed(
for (port = 0; port < port_max; port++) for (port = 0; port < port_max; port++)
{ {
const struct retro_keybind *mtkey = &input_config_binds[port][i]; const struct retro_keybind *metakey = &input_config_binds[port][i];
if (!mtkey->valid) if (!metakey->valid)
continue; continue;
joypad_info->joy_idx = settings->uints.input_joypad_map[port]; joypad_info->joy_idx = settings->uints.input_joypad_map[port];
joypad_info->auto_binds = input_autoconf_binds[joypad_info->joy_idx]; joypad_info->auto_binds = input_autoconf_binds[joypad_info->joy_idx];
@ -24148,7 +24148,6 @@ static void input_keys_pressed(
{ {
unsigned i, port = 0; unsigned i, port = 0;
settings_t *settings = p_rarch->configuration_settings; settings_t *settings = p_rarch->configuration_settings;
int input_hotkey_block_delay = settings->uints.input_hotkey_block_delay;
const struct retro_keybind *binds = input_config_binds[0]; const struct retro_keybind *binds = input_config_binds[0];
const struct retro_keybind *binds_norm = &input_config_binds[port][RARCH_ENABLE_HOTKEY]; const struct retro_keybind *binds_norm = &input_config_binds[port][RARCH_ENABLE_HOTKEY];
const struct retro_keybind *binds_auto = &input_autoconf_binds[port][RARCH_ENABLE_HOTKEY]; const struct retro_keybind *binds_auto = &input_autoconf_binds[port][RARCH_ENABLE_HOTKEY];
@ -24168,6 +24167,7 @@ static void input_keys_pressed(
&binds, port, &binds, port,
RETRO_DEVICE_JOYPAD, 0, RARCH_ENABLE_HOTKEY)) RETRO_DEVICE_JOYPAD, 0, RARCH_ENABLE_HOTKEY))
{ {
int input_hotkey_block_delay = settings->uints.input_hotkey_block_delay;
if (p_rarch->input_hotkey_block_counter < input_hotkey_block_delay) if (p_rarch->input_hotkey_block_counter < input_hotkey_block_delay)
p_rarch->input_hotkey_block_counter++; p_rarch->input_hotkey_block_counter++;
else else
@ -24201,9 +24201,9 @@ static void input_keys_pressed(
} }
} }
/* Check the libretro input first */
if (p_rarch->input_driver_block_libretro_input) if (p_rarch->input_driver_block_libretro_input)
{ {
/* Check the libretro input first */
for (i = 0; i < RARCH_FIRST_META_KEY; i++) for (i = 0; i < RARCH_FIRST_META_KEY; i++)
{ {
if (input_keys_pressed_other_sources(p_rarch, if (input_keys_pressed_other_sources(p_rarch,
@ -24215,7 +24215,6 @@ static void input_keys_pressed(
} }
else else
{ {
/* Check the libretro input first */
int16_t ret = p_rarch->current_input->input_state( int16_t ret = p_rarch->current_input->input_state(
p_rarch->current_input_data, p_rarch->current_input_data,
joypad_info, &binds, 0, RETRO_DEVICE_JOYPAD, 0, joypad_info, &binds, 0, RETRO_DEVICE_JOYPAD, 0,
@ -24232,9 +24231,9 @@ static void input_keys_pressed(
} }
} }
/* Check the hotkeys */
if (p_rarch->input_driver_block_hotkey) if (p_rarch->input_driver_block_hotkey)
{ {
/* Check the hotkeys */
for (i = RARCH_FIRST_META_KEY; i < RARCH_BIND_LIST_END; i++) for (i = RARCH_FIRST_META_KEY; i < RARCH_BIND_LIST_END; i++)
{ {
if ( if (
@ -24247,7 +24246,6 @@ static void input_keys_pressed(
} }
else else
{ {
/* Check the hotkeys */
for (i = RARCH_FIRST_META_KEY; i < RARCH_BIND_LIST_END; i++) for (i = RARCH_FIRST_META_KEY; i < RARCH_BIND_LIST_END; i++)
{ {
bool bit_pressed = binds[i].valid bool bit_pressed = binds[i].valid