mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-03 10:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

ToadKing's 'cooldown' hack causes too many problems - try

Browse Source 
different way of guarding against button A/B reacting too
quickly
This commit is contained in:
twinaphex 2015-07-06 00:49:24 +02:00
parent 044ef3d3f4
commit 49e35a5bcf
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
menu/menu_input.c
View File

@ -970,14 +970,15 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input)
unsigned ret = 0; unsigned ret = 0;
static bool initial_held = true; static bool initial_held = true;
static bool first_held = false; static bool first_held = false;
static int cooldown = 0;
static const retro_input_t input_repeat = static const retro_input_t input_repeat =
(1UL << RETRO_DEVICE_ID_JOYPAD_UP) (1UL << RETRO_DEVICE_ID_JOYPAD_UP)
| (1UL << RETRO_DEVICE_ID_JOYPAD_DOWN) | (1UL << RETRO_DEVICE_ID_JOYPAD_DOWN)
| (1UL << RETRO_DEVICE_ID_JOYPAD_LEFT) | (1UL << RETRO_DEVICE_ID_JOYPAD_LEFT)
| (1UL << RETRO_DEVICE_ID_JOYPAD_RIGHT) | (1UL << RETRO_DEVICE_ID_JOYPAD_RIGHT)
| (1UL << RETRO_DEVICE_ID_JOYPAD_L) | (1UL << RETRO_DEVICE_ID_JOYPAD_L)
| (1UL << RETRO_DEVICE_ID_JOYPAD_R); | (1UL << RETRO_DEVICE_ID_JOYPAD_R)
| (1UL << RETRO_DEVICE_ID_JOYPAD_A)
| (1UL << RETRO_DEVICE_ID_JOYPAD_B);
menu_navigation_t *nav = menu_navigation_get_ptr(); menu_navigation_t *nav = menu_navigation_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
menu_display_t *disp = menu_display_get_ptr(); menu_display_t *disp = menu_display_get_ptr();
@ -1042,16 +1043,10 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input)
ret = MENU_ACTION_SCROLL_UP; ret = MENU_ACTION_SCROLL_UP;
else if (trigger_input & (1ULL << settings->menu_scroll_down_btn)) else if (trigger_input & (1ULL << settings->menu_scroll_down_btn))
ret = MENU_ACTION_SCROLL_DOWN; ret = MENU_ACTION_SCROLL_DOWN;
else if (trigger_input & (1ULL << settings->menu_cancel_btn) && !cooldown) else if (trigger_input & (1ULL << settings->menu_cancel_btn))
{
ret = MENU_ACTION_CANCEL; ret = MENU_ACTION_CANCEL;
cooldown = 20; else if (trigger_input & (1ULL << settings->menu_ok_btn))
}
else if (trigger_input & (1ULL << settings->menu_ok_btn) && !cooldown)
{
ret = MENU_ACTION_OK; ret = MENU_ACTION_OK;
cooldown = 20;
}
else if (trigger_input & (1ULL << settings->menu_search_btn)) else if (trigger_input & (1ULL << settings->menu_search_btn))
ret = MENU_ACTION_SEARCH; ret = MENU_ACTION_SEARCH;
else if (trigger_input & (1ULL << RETRO_DEVICE_ID_JOYPAD_Y)) else if (trigger_input & (1ULL << RETRO_DEVICE_ID_JOYPAD_Y))
@ -1071,9 +1066,6 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input)
if (settings->menu.pointer.enable) if (settings->menu.pointer.enable)
menu_input_pointer(&ret); menu_input_pointer(&ret);
if (cooldown > 0)
cooldown--;
if (trigger_input && if (trigger_input &&
menu_ctx_driver_get_ptr()->perform_action && menu_ctx_driver_get_ptr()->perform_action &&
menu_ctx_driver_get_ptr()->perform_action(menu->userdata, ret)) menu_ctx_driver_get_ptr()->perform_action(menu->userdata, ret))