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 2017-05-21 17:10:53 +02:00
parent c92bf4d5e8
commit e49c71b142
1 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
menu/menu_event.c
View File

@ -248,33 +248,35 @@ unsigned menu_event(uint64_t input, uint64_t trigger_input)
trigger_input = 0; trigger_input = 0;
ok_trigger = 0; ok_trigger = 0;
} }
else
if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_UP)) {
ret = MENU_ACTION_UP; if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_UP))
else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_DOWN)) ret = MENU_ACTION_UP;
ret = MENU_ACTION_DOWN; else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_DOWN))
else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_LEFT)) ret = MENU_ACTION_DOWN;
ret = MENU_ACTION_LEFT; else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_LEFT))
else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_RIGHT)) ret = MENU_ACTION_LEFT;
ret = MENU_ACTION_RIGHT; else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_RIGHT))
else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_L)) ret = MENU_ACTION_RIGHT;
ret = MENU_ACTION_SCROLL_UP; else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_L))
else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_R)) ret = MENU_ACTION_SCROLL_UP;
ret = MENU_ACTION_SCROLL_DOWN; else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_R))
else if (ok_trigger) ret = MENU_ACTION_SCROLL_DOWN;
ret = MENU_ACTION_OK; else if (ok_trigger)
else if (trigger_input & (UINT64_C(1) << menu_cancel_btn)) ret = MENU_ACTION_OK;
ret = MENU_ACTION_CANCEL; else if (trigger_input & (UINT64_C(1) << menu_cancel_btn))
else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_X)) ret = MENU_ACTION_CANCEL;
ret = MENU_ACTION_SEARCH; else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_X))
else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_Y)) ret = MENU_ACTION_SEARCH;
ret = MENU_ACTION_SCAN; else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_Y))
else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_START)) ret = MENU_ACTION_SCAN;
ret = MENU_ACTION_START; else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_START))
else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_SELECT)) ret = MENU_ACTION_START;
ret = MENU_ACTION_INFO; else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_SELECT))
else if (trigger_input & (UINT64_C(1) << RARCH_MENU_TOGGLE)) ret = MENU_ACTION_INFO;
ret = MENU_ACTION_TOGGLE; else if (trigger_input & (UINT64_C(1) << RARCH_MENU_TOGGLE))
ret = MENU_ACTION_TOGGLE;
}
if (menu_event_kb_is_set(RETROK_F11)) if (menu_event_kb_is_set(RETROK_F11))
{ {