From af8caf45f76998388283c38de2e33c7a1de3f332 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 27 Sep 2013 17:00:00 +0200 Subject: [PATCH] (RGUI) RGUI_ACTION_SETTINGS was deprecated - get rid of it --- frontend/menu/menu_common.c | 4 +--- frontend/menu/menu_common.h | 1 - frontend/menu/rgui.c | 10 ---------- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c index 9f98ca78c2..826cf51701 100644 --- a/frontend/menu/menu_common.c +++ b/frontend/menu/menu_common.c @@ -744,10 +744,8 @@ bool menu_iterate(void) action = RGUI_ACTION_CANCEL; else if (rgui->trigger_state & (1ULL << RETRO_DEVICE_ID_JOYPAD_A)) action = RGUI_ACTION_OK; - else if (rgui->trigger_state & (1ULL << RETRO_DEVICE_ID_JOYPAD_SELECT)) - action = RGUI_ACTION_START; else if (rgui->trigger_state & (1ULL << RETRO_DEVICE_ID_JOYPAD_START)) - action = RGUI_ACTION_SETTINGS; + action = RGUI_ACTION_START; if (menu_ctx && menu_ctx->iterate) input_entry_ret = menu_ctx->iterate(rgui, action); diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h index 575c0b6d28..100d3650b5 100644 --- a/frontend/menu/menu_common.h +++ b/frontend/menu/menu_common.h @@ -174,7 +174,6 @@ typedef enum RGUI_ACTION_OK, RGUI_ACTION_CANCEL, RGUI_ACTION_REFRESH, - RGUI_ACTION_SETTINGS, RGUI_ACTION_START, RGUI_ACTION_MESSAGE, RGUI_ACTION_SCROLL_DOWN, diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c index f8f7922984..58d7db95c6 100644 --- a/frontend/menu/rgui.c +++ b/frontend/menu/rgui.c @@ -2292,10 +2292,6 @@ static int rgui_viewport_iterate(rgui_handle_t *rgui, rgui_action_t action) } break; - case RGUI_ACTION_SETTINGS: - rgui_list_pop(rgui->menu_stack, &rgui->selection_ptr); - break; - case RGUI_ACTION_MESSAGE: rgui->msg_force = true; break; @@ -2892,12 +2888,6 @@ static int rgui_iterate(void *data, unsigned action) rgui->need_refresh = true; break; - case RGUI_ACTION_SETTINGS: - rgui->need_refresh = true; - while (rgui->menu_stack->size > 1) - rgui_list_pop(rgui->menu_stack, &rgui->selection_ptr); - return rgui_settings_iterate(rgui, RGUI_ACTION_REFRESH); - case RGUI_ACTION_MESSAGE: rgui->msg_force = true; break;