CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-05 09:39:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pass value instead of pointer

Browse Source
This commit is contained in:
twinaphex 2017-05-21 20:47:53 +02:00
parent 184b519f84
commit 3e00c632bd
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
input/input_driver.c
View File

@ -609,40 +609,40 @@ static INLINE bool input_menu_keys_pressed_internal(
} }
static bool input_driver_toggle_button_combo( static bool input_driver_toggle_button_combo(
unsigned mode, uint64_t *trigger_input) unsigned mode, uint64_t input)
{ {
switch (mode) switch (mode)
{ {
case INPUT_TOGGLE_DOWN_Y_L_R: case INPUT_TOGGLE_DOWN_Y_L_R:
if (!BIT64_GET(*trigger_input, RETRO_DEVICE_ID_JOYPAD_DOWN)) if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_DOWN))
return false; return false;
if (!BIT64_GET(*trigger_input, RETRO_DEVICE_ID_JOYPAD_Y)) if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_Y))
return false; return false;
if (!BIT64_GET(*trigger_input, RETRO_DEVICE_ID_JOYPAD_L)) if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_L))
return false; return false;
if (!BIT64_GET(*trigger_input, RETRO_DEVICE_ID_JOYPAD_R)) if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_R))
return false; return false;
break; break;
case INPUT_TOGGLE_L3_R3: case INPUT_TOGGLE_L3_R3:
if (!BIT64_GET(*trigger_input, RETRO_DEVICE_ID_JOYPAD_L3)) if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_L3))
return false; return false;
if (!BIT64_GET(*trigger_input, RETRO_DEVICE_ID_JOYPAD_R3)) if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_R3))
return false; return false;
break; break;
case INPUT_TOGGLE_L1_R1_START_SELECT: case INPUT_TOGGLE_L1_R1_START_SELECT:
if (!BIT64_GET(*trigger_input, RETRO_DEVICE_ID_JOYPAD_START)) if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_START))
return false; return false;
if (!BIT64_GET(*trigger_input, RETRO_DEVICE_ID_JOYPAD_SELECT)) if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_SELECT))
return false; return false;
if (!BIT64_GET(*trigger_input, RETRO_DEVICE_ID_JOYPAD_L)) if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_L))
return false; return false;
if (!BIT64_GET(*trigger_input, RETRO_DEVICE_ID_JOYPAD_R)) if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_R))
return false; return false;
break; break;
case INPUT_TOGGLE_START_SELECT: case INPUT_TOGGLE_START_SELECT:
if (!BIT64_GET(*trigger_input, RETRO_DEVICE_ID_JOYPAD_START)) if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_START))
return false; return false;
if (!BIT64_GET(*trigger_input, RETRO_DEVICE_ID_JOYPAD_SELECT)) if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_SELECT))
return false; return false;
break; break;
default: default:
@ -733,7 +733,7 @@ uint64_t input_menu_keys_pressed(
const struct retro_keybind *mtkey = &input_config_binds[0][RARCH_MENU_TOGGLE]; const struct retro_keybind *mtkey = &input_config_binds[0][RARCH_MENU_TOGGLE];
if ( ((settings->uints.input_menu_toggle_gamepad_combo != INPUT_TOGGLE_NONE) && if ( ((settings->uints.input_menu_toggle_gamepad_combo != INPUT_TOGGLE_NONE) &&
input_driver_toggle_button_combo( input_driver_toggle_button_combo(
settings->uints.input_menu_toggle_gamepad_combo, &old_input)) settings->uints.input_menu_toggle_gamepad_combo, old_input))
|| input_menu_keys_pressed_internal( || input_menu_keys_pressed_internal(
binds, settings, joypad_info, RARCH_MENU_TOGGLE, max_users, binds, settings, joypad_info, RARCH_MENU_TOGGLE, max_users,
mtkey->valid, mtkey->valid,
@ -959,7 +959,8 @@ uint64_t input_keys_pressed(
#ifdef HAVE_MENU #ifdef HAVE_MENU
if ( if (
((settings->uints.input_menu_toggle_gamepad_combo != INPUT_TOGGLE_NONE) && ((settings->uints.input_menu_toggle_gamepad_combo != INPUT_TOGGLE_NONE) &&
input_driver_toggle_button_combo(settings->uints.input_menu_toggle_gamepad_combo, &old_input)) input_driver_toggle_button_combo(
settings->uints.input_menu_toggle_gamepad_combo, old_input))
|| input_keys_pressed_internal(settings, joypad_info, RARCH_MENU_TOGGLE, binds)) || input_keys_pressed_internal(settings, joypad_info, RARCH_MENU_TOGGLE, binds))
ret |= (UINT64_C(1) << RARCH_MENU_TOGGLE); ret |= (UINT64_C(1) << RARCH_MENU_TOGGLE);
#endif #endif