Rename load_menu_game to load_menu_content

This commit is contained in:
twinaphex 2014-07-28 01:55:59 +02:00
parent 6f541d84f9
commit f958587a57
4 changed files with 8 additions and 8 deletions

View File

@ -121,7 +121,7 @@ static int main_entry_iterate_content(args_type() args)
static int main_entry_iterate_load_content(args_type() args) static int main_entry_iterate_load_content(args_type() args)
{ {
if (load_menu_game()) if (load_menu_content())
{ {
g_extern.lifecycle_state |= (1ULL << MODE_GAME); g_extern.lifecycle_state |= (1ULL << MODE_GAME);
if (driver.video_data && driver.video_poke && driver.video_poke->set_aspect_ratio) if (driver.video_data && driver.video_poke && driver.video_poke->set_aspect_ratio)

View File

@ -2498,7 +2498,7 @@ static int menu_common_iterate(unsigned action)
} }
else if (menu_type == MENU_SETTINGS_OPEN_HISTORY) else if (menu_type == MENU_SETTINGS_OPEN_HISTORY)
{ {
load_menu_game_history(driver.menu->selection_ptr); load_menu_content_history(driver.menu->selection_ptr);
menu_flush_stack_type(MENU_SETTINGS); menu_flush_stack_type(MENU_SETTINGS);
ret = -1; ret = -1;
} }

View File

@ -99,7 +99,7 @@ void menu_content_history_push_current(void)
g_extern.system.info.library_name); g_extern.system.info.library_name);
} }
static void load_menu_game_prepare(void) static void load_menu_content_prepare(void)
{ {
if (!driver.menu) if (!driver.menu)
return; return;
@ -142,7 +142,7 @@ static void load_menu_game_prepare(void)
MENU_TEXTURE_FULLSCREEN); MENU_TEXTURE_FULLSCREEN);
} }
void load_menu_game_history(unsigned game_index) void load_menu_content_history(unsigned game_index)
{ {
const char *path = NULL; const char *path = NULL;
const char *core_path = NULL; const char *core_path = NULL;
@ -193,9 +193,9 @@ static void menu_environment_get(int *argc, char *argv[], void *args, void *para
wrap_args->touched = true; wrap_args->touched = true;
} }
bool load_menu_game(void) bool load_menu_content(void)
{ {
load_menu_game_prepare(); load_menu_content_prepare();
if (!(main_load_content(0, NULL, menu_environment_get, if (!(main_load_content(0, NULL, menu_environment_get,
driver.frontend_ctx->process_args))) driver.frontend_ctx->process_args)))

View File

@ -103,8 +103,8 @@ 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);
bool load_menu_game(void); bool load_menu_content(void);
void load_menu_game_history(unsigned game_index); void load_menu_content_history(unsigned game_index);
void menu_content_history_push_current(void); void menu_content_history_push_current(void);
bool menu_replace_config(const char *path); bool menu_replace_config(const char *path);