mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor away load_menu_game_prepare_dummy

Browse Source
This commit is contained in:
twinaphex 2014-07-25 22:11:34 +02:00
parent a34a7c58fb
commit 24f0dcc550
5 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/frontend.c
View File

@ -90,12 +90,10 @@ static int main_entry_iterate_shutdown(args_type() args)
{ {
(void)args; (void)args;
#ifdef HAVE_MENU
// Load dummy core instead of exiting RetroArch completely. // Load dummy core instead of exiting RetroArch completely.
if (g_settings.load_dummy_on_core_shutdown) if (g_settings.load_dummy_on_core_shutdown)
load_menu_game_prepare_dummy(); rarch_main_command(RARCH_CMD_PREPARE_DUMMY);
else else
#endif
return 1; return 1;
return 0; return 0;

14
frontend/menu/menu_common.c
View File

@ -179,18 +179,6 @@ static void menu_update_libretro_info(menu_handle_t *menu)
menu_update_system_info(menu, NULL); menu_update_system_info(menu, NULL);
} }
void load_menu_game_prepare_dummy(void)
{
// Starts dummy core.
*g_extern.fullpath = '\0';
if (driver.menu)
driver.menu->load_no_rom = false;
g_extern.lifecycle_state |= (1ULL << MODE_LOAD_GAME);
g_extern.system.shutdown = false;
}
bool load_menu_game(void) bool load_menu_game(void)
{ {
int rarch_argc, ret; int rarch_argc, ret;
@ -544,7 +532,7 @@ bool menu_replace_config(const char *path)
g_extern.block_config_read = false; g_extern.block_config_read = false;
*g_settings.libretro = '\0'; // Load core in new config. *g_settings.libretro = '\0'; // Load core in new config.
load_menu_game_prepare_dummy(); rarch_main_command(RARCH_CMD_PREPARE_DUMMY);
return true; return true;
} }

1
frontend/menu/menu_common.h
View File

@ -104,7 +104,6 @@ void menu_free(void *data);
void menu_ticker_line(char *buf, size_t len, unsigned tick, const char *str, bool selected); void menu_ticker_line(char *buf, size_t len, unsigned tick, const char *str, bool selected);
void load_menu_game_prepare(void); void load_menu_game_prepare(void);
void load_menu_game_prepare_dummy(void);
bool load_menu_game(void); bool load_menu_game(void);
void load_menu_game_history(unsigned game_index); void load_menu_game_history(unsigned game_index);
void menu_content_history_push_current(void); void menu_content_history_push_current(void);

1
general.h
View File

@ -97,6 +97,7 @@ enum basic_event
RARCH_CMD_LOAD_STATE, RARCH_CMD_LOAD_STATE,
RARCH_CMD_SAVE_STATE, RARCH_CMD_SAVE_STATE,
RARCH_CMD_TAKE_SCREENSHOT, RARCH_CMD_TAKE_SCREENSHOT,
RARCH_CMD_PREPARE_DUMMY,
RARCH_CMD_QUIT, RARCH_CMD_QUIT,
}; };

11
retroarch.c
View File

@ -3118,6 +3118,17 @@ void rarch_main_command(unsigned action)
case RARCH_CMD_TAKE_SCREENSHOT: case RARCH_CMD_TAKE_SCREENSHOT:
rarch_take_screenshot(); rarch_take_screenshot();
break; break;
case RARCH_CMD_PREPARE_DUMMY:
*g_extern.fullpath = '\0';
#ifdef HAVE_MENU
if (driver.menu)
driver.menu->load_no_rom = false;
#endif
g_extern.lifecycle_state |= (1ULL << MODE_LOAD_GAME);
g_extern.system.shutdown = false;
break;
case RARCH_CMD_QUIT: case RARCH_CMD_QUIT:
g_extern.system.shutdown = true; g_extern.system.shutdown = true;
break; break;