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

Refactor RARCH_ACTION_STATE_MENU_PREINIT into RARCH_ACTION_STATE_MENU_RUNNING

This commit is contained in:
twinaphex 2014-09-29 13:27:28 +02:00
parent 96958cc46e
commit c7d6eaa830
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/platform/platform_android.c
View File

@ -730,9 +730,6 @@ static void process_pending_intent(void *data)
if (startgame) if (startgame)
{ {
rarch_main_set_state(RARCH_ACTION_STATE_MENU_PREINIT_FINISHED);
rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED);
rarch_main_command(RARCH_CMD_LOAD_CONTENT);
} }
CALL_VOID_METHOD(env, android_app->activity->clazz, CALL_VOID_METHOD(env, android_app->activity->clazz,

1
general.h
View File

@ -136,7 +136,6 @@ enum basic_event
enum action_state enum action_state
{ {
RARCH_ACTION_STATE_NONE = 0, RARCH_ACTION_STATE_NONE = 0,
RARCH_ACTION_STATE_MENU_PREINIT,
RARCH_ACTION_STATE_LOAD_CONTENT, RARCH_ACTION_STATE_LOAD_CONTENT,
RARCH_ACTION_STATE_MENU_RUNNING, RARCH_ACTION_STATE_MENU_RUNNING,
RARCH_ACTION_STATE_MENU_RUNNING_FINISHED, RARCH_ACTION_STATE_MENU_RUNNING_FINISHED,

11
retroarch.c
View File

@ -2789,7 +2789,7 @@ void rarch_main_set_state(unsigned cmd)
{ {
switch (cmd) switch (cmd)
{ {
case RARCH_ACTION_STATE_MENU_PREINIT: case RARCH_ACTION_STATE_MENU_RUNNING:
{ {
int i; int i;
@ -2815,11 +2815,11 @@ void rarch_main_set_state(unsigned cmd)
g_extern.system.key_event = menu_key_event; g_extern.system.key_event = menu_key_event;
driver.menu->need_refresh = true; driver.menu->need_refresh = true;
rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING);
} }
#endif #endif
g_extern.system.frame_time_last = 0; g_extern.system.frame_time_last = 0;
} }
g_extern.is_menu = true;
break; break;
case RARCH_ACTION_STATE_LOAD_CONTENT: case RARCH_ACTION_STATE_LOAD_CONTENT:
#ifdef HAVE_MENU #ifdef HAVE_MENU
@ -2827,13 +2827,10 @@ void rarch_main_set_state(unsigned cmd)
{ {
/* If content loading fails, we go back to menu. */ /* If content loading fails, we go back to menu. */
if (driver.menu) if (driver.menu)
rarch_main_set_state(RARCH_ACTION_STATE_MENU_PREINIT); rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING);
} }
#endif #endif
break; break;
case RARCH_ACTION_STATE_MENU_RUNNING:
g_extern.is_menu = true;
break;
case RARCH_ACTION_STATE_MENU_RUNNING_FINISHED: case RARCH_ACTION_STATE_MENU_RUNNING_FINISHED:
g_extern.is_menu = false; g_extern.is_menu = false;
@ -3202,7 +3199,7 @@ static void do_state_check_menu_toggle(void)
return; return;
} }
rarch_main_set_state(RARCH_ACTION_STATE_MENU_PREINIT); rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING);
} }
bool rarch_main_iterate(void) bool rarch_main_iterate(void)