From b5e82dae590cb4da4119ebccff05a291af752f10 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 10 Jan 2013 20:29:07 +0100 Subject: [PATCH] (RARCH_CONSOLE) Refactor ingame_menu.enable variable --- console/rarch_console.h | 1 + console/rarch_console_settings.c | 2 +- frontend/menu/rmenu.c | 10 +++++----- frontend/menu/rmenu_gx.c | 2 +- frontend/menu/rmenu_xui.cpp | 2 +- general.h | 1 - retroarch.c | 13 ++++++++----- 7 files changed, 17 insertions(+), 14 deletions(-) diff --git a/console/rarch_console.h b/console/rarch_console.h index 9062b3c040..1168f2efea 100644 --- a/console/rarch_console.h +++ b/console/rarch_console.h @@ -73,6 +73,7 @@ enum MODE_INIT, MODE_MENU, MODE_MENU_PREINIT, + MODE_MENU_INGAME, MODE_MENU_DRAW, MODE_EXIT, MODE_LOAD_FIRST_SHADER, diff --git a/console/rarch_console_settings.c b/console/rarch_console_settings.c index 972ef77f59..548dafaae7 100644 --- a/console/rarch_console_settings.c +++ b/console/rarch_console_settings.c @@ -87,7 +87,7 @@ void rarch_settings_change(unsigned setting) } break; case S_QUIT: - g_extern.console.rmenu.state.ingame_menu.enable = false; + g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_INGAME); g_extern.lifecycle_menu_state = (1 << MODE_EXIT); break; case S_QUIT_RARCH: diff --git a/frontend/menu/rmenu.c b/frontend/menu/rmenu.c index 9bd0486618..4fb0ef198f 100644 --- a/frontend/menu/rmenu.c +++ b/frontend/menu/rmenu.c @@ -2031,9 +2031,9 @@ int ingame_menu_screenshot(void *data, void *state) g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_DRAW); - if(g_extern.console.rmenu.state.ingame_menu.enable) + if (g_extern.lifecycle_menu_state & (1 << MODE_MENU_INGAME)) { - if(input & (1ULL << RMENU_DEVICE_NAV_A)) + if (input & (1ULL << RMENU_DEVICE_NAV_A)) { menu_stack_pop(); g_extern.lifecycle_menu_state |= (1 << MODE_MENU_DRAW); @@ -2425,7 +2425,7 @@ bool rmenu_iterate(void) if (g_extern.lifecycle_menu_state & (1 << MODE_MENU_PREINIT)) { - if(g_extern.console.rmenu.state.ingame_menu.enable) + if (g_extern.lifecycle_menu_state & (1 << MODE_MENU_INGAME)) menu_stack_push(INGAME_MENU); menu_stack_force_refresh(); @@ -2506,11 +2506,11 @@ deinit: if (!(g_extern.lifecycle_state & (1ULL << RARCH_FRAMEADVANCE))) g_extern.delay_timer[0] = g_extern.frame_count + 30; - if(g_extern.console.rmenu.state.ingame_menu.enable) + if (g_extern.lifecycle_menu_state & (1 << MODE_MENU_INGAME)) menu_stack_pop(); g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_DRAW); - g_extern.console.rmenu.state.ingame_menu.enable = false; + g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_INGAME); device_ptr->ctx_driver->rmenu_free(); diff --git a/frontend/menu/rmenu_gx.c b/frontend/menu/rmenu_gx.c index 1cbed016a4..afd439eec6 100644 --- a/frontend/menu/rmenu_gx.c +++ b/frontend/menu/rmenu_gx.c @@ -266,7 +266,7 @@ deinit: g_extern.delay_timer[0] = g_extern.frame_count + 30; g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_DRAW); - g_extern.console.rmenu.state.ingame_menu.enable = false; + g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_INGAME); return false; } diff --git a/frontend/menu/rmenu_xui.cpp b/frontend/menu/rmenu_xui.cpp index bf7902faf1..e5b8f8ecbd 100644 --- a/frontend/menu/rmenu_xui.cpp +++ b/frontend/menu/rmenu_xui.cpp @@ -1237,7 +1237,7 @@ deinit: if(!(g_extern.lifecycle_state & (1ULL << RARCH_FRAMEADVANCE))) g_extern.delay_timer[0] = g_extern.frame_count + 30; - g_extern.console.rmenu.state.ingame_menu.enable = false; + g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_INGAME); g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_DRAW); return false; diff --git a/general.h b/general.h index b9e5d650c8..06a6642932 100644 --- a/general.h +++ b/general.h @@ -484,7 +484,6 @@ struct global { rarch_boolean_state_t msg_fps; rarch_boolean_state_t msg_info; - rarch_boolean_state_t ingame_menu; rarch_boolean_state_t rmenu_widescreen; rarch_boolean_state_t rmenu_hd; } state; diff --git a/retroarch.c b/retroarch.c index 289f5b85a6..85260609d9 100644 --- a/retroarch.c +++ b/retroarch.c @@ -2793,11 +2793,13 @@ bool rarch_main_iterate(void) { #ifdef HAVE_RMENU bool rmenu_enable = input_key_pressed_func(RARCH_RMENU_TOGGLE); - g_extern.console.rmenu.state.ingame_menu.enable = input_key_pressed_func(RARCH_RMENU_QUICKMENU_TOGGLE); + if (input_key_pressed_func(RARCH_RMENU_QUICKMENU_TOGGLE)) + g_extern.lifecycle_menu_state |= (1 << MODE_MENU_INGAME); - if (rmenu_enable || (g_extern.console.rmenu.state.ingame_menu.enable && !rmenu_enable)) + if (rmenu_enable || ((g_extern.lifecycle_menu_state & (1 << MODE_MENU_INGAME)) && !rmenu_enable)) { - g_extern.lifecycle_menu_state = (1 << MODE_MENU); + g_extern.lifecycle_menu_state &= ~(1 << MODE_EMULATION); + g_extern.lifecycle_menu_state |= (1 << MODE_MENU); g_extern.delay_timer[0] = g_extern.frame_count + 30; } #endif @@ -2848,8 +2850,9 @@ bool rarch_main_iterate(void) if (input_key_pressed_func(RARCH_FRAMEADVANCE)) { g_extern.lifecycle_state &= ~(1ULL << RARCH_FRAMEADVANCE); - g_extern.console.rmenu.state.ingame_menu.enable = true; - g_extern.lifecycle_menu_state = (1 << MODE_MENU); + g_extern.lifecycle_menu_state &= ~(1 << MODE_EMULATION); + g_extern.lifecycle_menu_state |= (1 << MODE_MENU); + g_extern.lifecycle_menu_state |= (1 << MODE_MENU_INGAME); return false; } #endif