From 261ac0e3e75777944a0ac47003cde0f923030a40 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 31 May 2014 05:41:32 +0200 Subject: [PATCH] (RARCH_CONSOLE) Now uses same menu input binds for menu as PC - allows analog sticks to be used for navigation as well for consoles --- frontend/menu/menu_common.c | 4 ---- settings.c | 3 --- 2 files changed, 7 deletions(-) diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c index bf49342e4e..36e8f261af 100644 --- a/frontend/menu/menu_common.c +++ b/frontend/menu/menu_common.c @@ -431,11 +431,7 @@ uint64_t menu_input(void) { unsigned i; uint64_t input_state; -#ifdef RARCH_CONSOLE - static const struct retro_keybind *binds[] = { g_settings.input.menu_binds }; -#else static const struct retro_keybind *binds[] = { g_settings.input.binds[0] }; -#endif rgui_handle_t *rgui = (rgui_handle_t*)driver.menu; if (!rgui) diff --git a/settings.c b/settings.c index f968792ba7..53116aad74 100644 --- a/settings.c +++ b/settings.c @@ -352,9 +352,6 @@ void config_set_defaults(void) rarch_assert(sizeof(g_settings.input.binds[0]) >= sizeof(retro_keybinds_1)); rarch_assert(sizeof(g_settings.input.binds[1]) >= sizeof(retro_keybinds_rest)); memcpy(g_settings.input.binds[0], retro_keybinds_1, sizeof(retro_keybinds_1)); -#ifdef RARCH_CONSOLE - memcpy(g_settings.input.menu_binds, retro_keybinds_menu, sizeof(retro_keybinds_menu)); -#endif for (i = 1; i < MAX_PLAYERS; i++) memcpy(g_settings.input.binds[i], retro_keybinds_rest, sizeof(retro_keybinds_rest));