From c1f5fc889037326738cabc27515ea03ae32ecf2b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 13 Jan 2013 03:34:55 +0100 Subject: [PATCH] Rename MODE_EMULATION define to MODE_GAME --- frontend/frontend_console.c | 6 +++--- frontend/menu/rgui.c | 10 +++++----- frontend/menu/rmenu.c | 20 ++++++++++---------- frontend/menu/rmenu_gx.c | 2 +- frontend/menu/rmenu_settings.c | 2 +- frontend/menu/rmenu_xui.cpp | 14 +++++++------- frontend/platform/platform_ps3.c | 2 +- general.h | 6 +++--- 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/frontend/frontend_console.c b/frontend/frontend_console.c index e4999c9c51..67c9a38e5b 100644 --- a/frontend/frontend_console.c +++ b/frontend/frontend_console.c @@ -303,7 +303,7 @@ int main(int argc, char *argv[]) system_process_args(argc, argv); begin_loop: - if(g_extern.lifecycle_mode_state & (1ULL << MODE_EMULATION)) + if(g_extern.lifecycle_mode_state & (1ULL << MODE_GAME)) { driver.input->poll(NULL); driver.video->set_aspect_ratio(driver.video_data, g_settings.video.aspect_ratio_idx); @@ -315,7 +315,7 @@ begin_loop: if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_THROTTLE_ENABLE)) audio_stop_func(); - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_EMULATION); + g_extern.lifecycle_mode_state &= ~(1ULL << MODE_GAME); } else if (g_extern.lifecycle_mode_state & (1ULL << MODE_INIT)) { @@ -336,7 +336,7 @@ begin_loop: if (init_ret == 0) { RARCH_LOG("rarch_main_init succeeded.\n"); - g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); + g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME); } else { diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c index 96e33736f7..3f4cccf486 100644 --- a/frontend/menu/rgui.c +++ b/frontend/menu/rgui.c @@ -238,7 +238,7 @@ rgui_handle_t *rgui_init(const char *base_path, else { RARCH_ERR("no font bmp or bin, abort"); - g_extern.lifecycle_mode_state &= ~((1ULL << MODE_MENU) | (1ULL << MODE_MENU_INGAME) | (1ULL << MODE_EMULATION)); + g_extern.lifecycle_mode_state &= ~((1ULL << MODE_MENU) | (1ULL << MODE_MENU_INGAME) | (1ULL << MODE_GAME)); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT); } @@ -575,7 +575,7 @@ static int rgui_settings_toggle_setting(rgui_file_type_t setting, rgui_action_t rarch_save_state(); else rarch_load_state(); - g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); + g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME); return -1; } else if (action == RGUI_ACTION_START) @@ -606,7 +606,7 @@ static int rgui_settings_toggle_setting(rgui_file_type_t setting, rgui_action_t if (action == RGUI_ACTION_OK) { rarch_game_reset(); - g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); + g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME); return -1; } break; @@ -786,7 +786,7 @@ static int rgui_settings_toggle_setting(rgui_file_type_t setting, rgui_action_t #ifdef GEKKO snprintf(g_extern.fullpath, sizeof(g_extern.fullpath), "%s/boot.dol", default_paths.core_dir); #endif - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_EMULATION); + g_extern.lifecycle_mode_state &= ~(1ULL << MODE_GAME); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXITSPAWN); return -1; @@ -795,7 +795,7 @@ static int rgui_settings_toggle_setting(rgui_file_type_t setting, rgui_action_t case RGUI_SETTINGS_QUIT_EMULATOR: if (action == RGUI_ACTION_OK) { - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_EMULATION); + g_extern.lifecycle_mode_state &= ~(1ULL << MODE_GAME); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT); return -1; } diff --git a/frontend/menu/rmenu.c b/frontend/menu/rmenu.c index de0c2518dd..a9d6b6c278 100644 --- a/frontend/menu/rmenu.c +++ b/frontend/menu/rmenu.c @@ -1454,7 +1454,7 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input) case SETTING_QUIT_RARCH: if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B)) || (input & (1ULL << RMENU_DEVICE_NAV_B))) { - g_extern.lifecycle_mode_state &= ~((1ULL << MODE_EMULATION)); + g_extern.lifecycle_mode_state &= ~((1ULL << MODE_GAME)); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT); return -1; } @@ -2125,7 +2125,7 @@ int ingame_menu(void *data, void *state) if(input & (1ULL << RMENU_DEVICE_NAV_A)) { g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_INGAME_EXIT); - g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); + g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME); return -1; } @@ -2135,7 +2135,7 @@ int ingame_menu(void *data, void *state) if(input & (1ULL << RMENU_DEVICE_NAV_B)) { rarch_load_state(); - g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); + g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_INGAME_EXIT); return -1; } @@ -2150,7 +2150,7 @@ int ingame_menu(void *data, void *state) if(input & (1ULL << RMENU_DEVICE_NAV_B)) { rarch_save_state(); - g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); + g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_INGAME_EXIT); return -1; } @@ -2232,7 +2232,7 @@ int ingame_menu(void *data, void *state) case MENU_ITEM_RETURN_TO_GAME: if(input & (1ULL << RMENU_DEVICE_NAV_B)) { - g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); + g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_INGAME_EXIT); return -1; } @@ -2243,7 +2243,7 @@ int ingame_menu(void *data, void *state) if(input & (1ULL << RMENU_DEVICE_NAV_B)) { rarch_game_reset(); - g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); + g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_INGAME_EXIT); return -1; } @@ -2274,7 +2274,7 @@ int ingame_menu(void *data, void *state) { RARCH_LOG("Boot Multiman: %s.\n", default_paths.multiman_self_file); strlcpy(g_extern.fullpath, default_paths.multiman_self_file, sizeof(g_extern.fullpath)); - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_EMULATION); + g_extern.lifecycle_mode_state &= ~(1ULL << MODE_GAME); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_INGAME_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXITSPAWN); @@ -2286,7 +2286,7 @@ int ingame_menu(void *data, void *state) case MENU_ITEM_QUIT_RARCH: if(input & (1ULL << RMENU_DEVICE_NAV_B)) { - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_EMULATION); + g_extern.lifecycle_mode_state &= ~(1ULL << MODE_GAME); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_INGAME_EXIT); return -1; @@ -2314,7 +2314,7 @@ int ingame_menu(void *data, void *state) if((input & (1ULL << RMENU_DEVICE_NAV_L3)) && (input & (1ULL << RMENU_DEVICE_NAV_R3))) { - g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); + g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_INGAME_EXIT); return -1; } @@ -2457,7 +2457,7 @@ int rmenu_input_process(void *data, void *state) if (return_to_game_enable) { - g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); + g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME); return -1; } } diff --git a/frontend/menu/rmenu_gx.c b/frontend/menu/rmenu_gx.c index 543e251cdd..36ccd569a9 100644 --- a/frontend/menu/rmenu_gx.c +++ b/frontend/menu/rmenu_gx.c @@ -186,7 +186,7 @@ int rmenu_input_process(void *data, void *state) if (return_to_game_enable) { - g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); + g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME); return -1; } } diff --git a/frontend/menu/rmenu_settings.c b/frontend/menu/rmenu_settings.c index 665a58b420..6f2e7bf28d 100644 --- a/frontend/menu/rmenu_settings.c +++ b/frontend/menu/rmenu_settings.c @@ -51,7 +51,7 @@ void rmenu_settings_set(unsigned setting) break; case S_FRAME_ADVANCE: g_extern.lifecycle_state |= (1ULL << RARCH_FRAMEADVANCE); - g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); + g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME); break; case S_HW_TEXTURE_FILTER: g_settings.video.smooth = !g_settings.video.smooth; diff --git a/frontend/menu/rmenu_xui.cpp b/frontend/menu/rmenu_xui.cpp index 74b0333a1e..b1738e5d6a 100644 --- a/frontend/menu/rmenu_xui.cpp +++ b/frontend/menu/rmenu_xui.cpp @@ -837,7 +837,7 @@ HRESULT CRetroArchQuickMenu::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled if (g_extern.main_is_init) { rarch_load_state(); - g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); + g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME); process_input_ret = -1; } break; @@ -845,7 +845,7 @@ HRESULT CRetroArchQuickMenu::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled if (g_extern.main_is_init) { rarch_save_state(); - g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); + g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME); process_input_ret = -1; } break; @@ -887,19 +887,19 @@ HRESULT CRetroArchQuickMenu::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled if (g_extern.main_is_init) { rarch_game_reset(); - g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); + g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME); process_input_ret = -1; } break; case MENU_ITEM_RETURN_TO_GAME: if (g_extern.main_is_init) { - g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); + g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME); process_input_ret = -1; } break; case MENU_ITEM_QUIT_RARCH: - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_EMULATION); + g_extern.lifecycle_mode_state &= ~(1ULL << MODE_GAME); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT); process_input_ret = -1; break; @@ -1110,7 +1110,7 @@ HRESULT CRetroArchMain::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled ) } else if (hObjPressed == m_quit) { - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_EMULATION); + g_extern.lifecycle_mode_state &= ~(1ULL << MODE_GAME); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT); process_input_ret = -1; } @@ -1265,7 +1265,7 @@ bool rmenu_iterate(void) if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU)) if (rmenu_enable) { - g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); + g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME); process_input_ret = -1; } } diff --git a/frontend/platform/platform_ps3.c b/frontend/platform/platform_ps3.c index fe2d542b1e..f28bb1ab36 100644 --- a/frontend/platform/platform_ps3.c +++ b/frontend/platform/platform_ps3.c @@ -155,7 +155,7 @@ static void callback_sysutil_exit(uint64_t status, uint64_t param, void *userdat { case CELL_SYSUTIL_REQUEST_EXITGAME: gl->quitting = true; - g_extern.lifecycle_mode_state &= ~((1ULL << MODE_MENU) | (1ULL << MODE_MENU_INGAME) | (1ULL << MODE_EMULATION)); + g_extern.lifecycle_mode_state &= ~((1ULL << MODE_MENU) | (1ULL << MODE_MENU_INGAME) | (1ULL << MODE_GAME)); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT); break; #ifdef HAVE_OSKUTIL diff --git a/general.h b/general.h index 680709139c..a81c142529 100644 --- a/general.h +++ b/general.h @@ -102,8 +102,10 @@ enum dpad_emu_enums enum menu_enums { - MODE_EMULATION = 0, + MODE_GAME = 0, MODE_LOAD_GAME, + MODE_LOAD_FIRST_SHADER, + MODE_LOAD_SECOND_SHADER, MODE_INIT, MODE_MENU, MODE_MENU_WIDESCREEN, @@ -119,8 +121,6 @@ enum menu_enums MODE_EXTLAUNCH_MULTIMAN, MODE_EXIT, MODE_EXITSPAWN, - MODE_LOAD_FIRST_SHADER, - MODE_LOAD_SECOND_SHADER, MODE_VIDEO_TRIPLE_BUFFERING_ENABLE, MODE_VIDEO_FLICKER_FILTER_ENABLE, MODE_VIDEO_SOFT_FILTER_ENABLE,