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

(menu_event.c) Add FIXME and some cleanups

This commit is contained in:
twinaphex 2016-12-02 01:43:43 +01:00
parent ff2892498e
commit c8ff6d9030
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
menu/menu_event.c
View File

@ -187,7 +187,6 @@ void menu_event_keyboard_set(bool down, enum retro_key key)
unsigned menu_event(uint64_t input, uint64_t trigger_input) unsigned menu_event(uint64_t input, uint64_t trigger_input)
{ {
unsigned menu_ok_btn, menu_cancel_btn;
menu_animation_ctx_delta_t delta; menu_animation_ctx_delta_t delta;
float delta_time; float delta_time;
/* Used for key repeat */ /* Used for key repeat */
@ -201,17 +200,16 @@ unsigned menu_event(uint64_t input, uint64_t trigger_input)
size_t new_scroll_accel = 0; size_t new_scroll_accel = 0;
menu_input_t *menu_input = NULL; menu_input_t *menu_input = NULL;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
bool ok_current = false;
static bool ok_old = false; static bool ok_old = false;
bool ok_trigger = false; unsigned menu_ok_btn = settings->input.menu_swap_ok_cancel_buttons ?
menu_ok_btn = settings->input.menu_swap_ok_cancel_buttons ?
RETRO_DEVICE_ID_JOYPAD_B : RETRO_DEVICE_ID_JOYPAD_A; RETRO_DEVICE_ID_JOYPAD_B : RETRO_DEVICE_ID_JOYPAD_A;
menu_cancel_btn = settings->input.menu_swap_ok_cancel_buttons ? unsigned menu_cancel_btn = settings->input.menu_swap_ok_cancel_buttons ?
RETRO_DEVICE_ID_JOYPAD_A : RETRO_DEVICE_ID_JOYPAD_B; RETRO_DEVICE_ID_JOYPAD_A : RETRO_DEVICE_ID_JOYPAD_B;
bool ok_current = input & UINT64_C(1) << menu_ok_btn;
/* TODO/FIXME - unsafe use of type 'bool' in operation */
bool ok_trigger = ok_current & ~ok_old;
ok_current = input & UINT64_C(1) << menu_ok_btn;
ok_trigger = ok_current & ~ok_old;
ok_old = ok_current; ok_old = ok_current;
if (input) if (input)