ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(RARCH_CONSOLE) Easier flow control

This commit is contained in:
twinaphex 2013-01-11 02:32:21 +01:00
parent d324b21949
commit 6e1fbafb30
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/frontend_console.c
View File

@ -275,6 +275,7 @@ begin_loop:
audio_start_func(); audio_start_func();
while(rarch_main_iterate()); while(rarch_main_iterate());
audio_stop_func(); audio_stop_func();
g_extern.lifecycle_menu_state &= ~(1 << MODE_EMULATION);
} }
else if (g_extern.lifecycle_menu_state & (1 << MODE_INIT)) else if (g_extern.lifecycle_menu_state & (1 << MODE_INIT))
{ {
@ -295,14 +296,15 @@ begin_loop:
if (init_ret == 0) if (init_ret == 0)
{ {
RARCH_LOG("rarch_main_init succeeded.\n"); RARCH_LOG("rarch_main_init succeeded.\n");
g_extern.lifecycle_menu_state = (1 << MODE_EMULATION); g_extern.lifecycle_menu_state |= (1 << MODE_EMULATION);
} }
else else
{ {
RARCH_ERR("rarch_main_init failed.\n"); RARCH_ERR("rarch_main_init failed.\n");
g_extern.lifecycle_menu_state = (1 << MODE_MENU); g_extern.lifecycle_menu_state |= (1 << MODE_MENU);
rarch_settings_msg(S_MSG_ROM_LOADING_ERROR, S_DELAY_180); rarch_settings_msg(S_MSG_ROM_LOADING_ERROR, S_DELAY_180);
} }
g_extern.lifecycle_menu_state &= ~(1 << MODE_INIT);
} }
else if(g_extern.lifecycle_menu_state & (1 << MODE_MENU)) else if(g_extern.lifecycle_menu_state & (1 << MODE_MENU))
{ {

6
retroarch.c
View File

@ -2782,7 +2782,7 @@ bool rarch_main_iterate(void)
if (g_extern.system.shutdown) if (g_extern.system.shutdown)
{ {
#ifdef HAVE_RMENU #ifdef HAVE_RMENU
g_extern.lifecycle_menu_state = (1 << MODE_EXIT); g_extern.lifecycle_menu_state |= (1 << MODE_EXIT);
#endif #endif
return false; return false;
} }
@ -2798,11 +2798,12 @@ bool rarch_main_iterate(void)
if (rmenu_enable || ((g_extern.lifecycle_menu_state & (1 << MODE_MENU_INGAME)) && !rmenu_enable)) if (rmenu_enable || ((g_extern.lifecycle_menu_state & (1 << MODE_MENU_INGAME)) && !rmenu_enable))
{ {
g_extern.lifecycle_menu_state &= ~(1 << MODE_EMULATION);
g_extern.lifecycle_menu_state |= (1 << MODE_MENU); g_extern.lifecycle_menu_state |= (1 << MODE_MENU);
g_extern.delay_timer[0] = g_extern.frame_count + 30; g_extern.delay_timer[0] = g_extern.frame_count + 30;
} }
#endif #endif
else
g_extern.lifecycle_menu_state |= (1 << MODE_EXIT);
return false; return false;
} }
@ -2850,7 +2851,6 @@ bool rarch_main_iterate(void)
if (input_key_pressed_func(RARCH_FRAMEADVANCE)) if (input_key_pressed_func(RARCH_FRAMEADVANCE))
{ {
g_extern.lifecycle_state &= ~(1ULL << RARCH_FRAMEADVANCE); g_extern.lifecycle_state &= ~(1ULL << RARCH_FRAMEADVANCE);
g_extern.lifecycle_menu_state &= ~(1 << MODE_EMULATION);
g_extern.lifecycle_menu_state |= (1 << MODE_MENU); g_extern.lifecycle_menu_state |= (1 << MODE_MENU);
g_extern.lifecycle_menu_state |= (1 << MODE_MENU_INGAME); g_extern.lifecycle_menu_state |= (1 << MODE_MENU_INGAME);
return false; return false;