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

(RMenu/RGUI) Use similar defines for menu

Browse Source
This commit is contained in:
twinaphex 2013-04-18 02:48:18 +02:00
parent 84f80dc2c1
commit 54725d009c
2 changed files with 204 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/menu/rgui.c
View File

@ -1947,7 +1947,7 @@ enum
DEVICE_NAV_START,
DEVICE_NAV_SELECT,
DEVICE_NAV_MENU,
RMENU_DEVICE_NAV_LAST
DEVICE_NAV_LAST
};
@ -2009,14 +2009,14 @@ static uint64_t menu_input_state(void)
// FIXME: Very ugly. Should do something more uniform.
#if defined(RARCH_CONSOLE) || defined(ANDROID)
for (unsigned i = 0; i < RMENU_DEVICE_NAV_LAST; i++)
for (unsigned i = 0; i < DEVICE_NAV_LAST; i++)
input_state |= driver.input->input_state(driver.input_data, menu_nav_binds, 0,
RETRO_DEVICE_JOYPAD, 0, i) ? (1ULL << i) : 0;
input_state |= driver.input->key_pressed(driver.input_data, RARCH_MENU_TOGGLE) ? (1ULL << DEVICE_NAV_MENU) : 0;
#ifdef HAVE_OVERLAY
for (unsigned i = 0; i < RMENU_DEVICE_NAV_LAST; i++)
for (unsigned i = 0; i < DEVICE_NAV_LAST; i++)
input_state |= driver.overlay_state & menu_nav_binds[0][i].joykey ? (1ULL << i) : 0;
#endif
#else

402
frontend/menu/rmenu.c
View File

File diff suppressed because it is too large Load Diff