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

(Menu) Refactor away load_menu_game_new_core

Browse Source
This commit is contained in:
twinaphex 2014-07-22 03:41:24 +02:00
parent 176b4f91b6
commit d27ffd007f
3 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/menu/menu_common.c
View File

@ -438,20 +438,6 @@ void menu_flush_stack_type(unsigned final_type)
} }
} }
void load_menu_game_new_core(void)
{
if (!driver.menu)
return;
#ifdef HAVE_DYNAMIC
rarch_main_command(RARCH_CMD_LOAD_CORE);
g_extern.lifecycle_state |= (1ULL << MODE_LOAD_GAME);
#else
rarch_environment_cb(RETRO_ENVIRONMENT_SET_LIBRETRO_PATH, (void*)g_settings.libretro);
rarch_environment_cb(RETRO_ENVIRONMENT_EXEC, (void*)g_extern.fullpath);
#endif
}
bool menu_iterate(void) bool menu_iterate(void)
{ {
unsigned action; unsigned action;

1
frontend/menu/menu_common.h
View File

@ -107,7 +107,6 @@ void load_menu_game_prepare(void);
void load_menu_game_prepare_dummy(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);
extern void load_menu_game_new_core(void);
void menu_rom_history_push(const char *path, const char *core_path, void menu_rom_history_push(const char *path, const char *core_path,
const char *core_name); const char *core_name);
void menu_rom_history_push_current(void); void menu_rom_history_push_current(void);

8
retroarch.c
View File

@ -3084,8 +3084,12 @@ void rarch_main_command(unsigned action)
switch (action) switch (action)
{ {
case RARCH_CMD_LOAD_CONTENT: case RARCH_CMD_LOAD_CONTENT:
#ifdef HAVE_MENU #ifdef HAVE_DYNAMIC
load_menu_game_new_core(); rarch_main_command(RARCH_CMD_LOAD_CORE);
g_extern.lifecycle_state |= (1ULL << MODE_LOAD_GAME);
#else
rarch_environment_cb(RETRO_ENVIRONMENT_SET_LIBRETRO_PATH, (void*)g_settings.libretro);
rarch_environment_cb(RETRO_ENVIRONMENT_EXEC, (void*)g_extern.fullpath);
#endif #endif
break; break;
case RARCH_CMD_LOAD_CORE: case RARCH_CMD_LOAD_CORE: