From 8a58583c558f370ec6b6dbe9eb93b2b790765923 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 25 Jun 2015 11:12:07 +0200 Subject: [PATCH] Start using rarch_system_info_get_ptr everywhere --- menu/cbs/menu_cbs_ok.c | 7 +++++-- menu/menu_entries.c | 12 +++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 1a8bc032da..e5587736f4 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -27,6 +27,7 @@ #include "../../retroarch.h" #include "../../runloop_data.h" #include "../../input/input_remapping.h" +#include "../../system.h" /* FIXME - Global variables, refactor */ char detect_content_path[PATH_MAX_LENGTH]; @@ -785,7 +786,8 @@ static int action_ok_remap_file_save_core(const char *path, char file[PATH_MAX_LENGTH] = {0}; global_t *global = global_get_ptr(); settings_t *settings = config_get_ptr(); - const char *core_name = global ? global->system.info.library_name : NULL; + struct retro_system_info *info = rarch_system_info_get_ptr(); + const char *core_name = info ? info->library_name : NULL; fill_pathname_join(directory,settings->input_remapping_directory,core_name,PATH_MAX_LENGTH); fill_pathname_join(file,core_name,core_name,PATH_MAX_LENGTH); @@ -808,7 +810,8 @@ static int action_ok_remap_file_save_game(const char *path, char file[PATH_MAX_LENGTH] = {0}; global_t *global = global_get_ptr(); settings_t *settings = config_get_ptr(); - const char *core_name = global ? global->system.info.library_name : NULL; + struct retro_system_info *info = rarch_system_info_get_ptr(); + const char *core_name = info ? info->library_name : NULL; const char *game_name = global ? path_basename(global->basename) : NULL; fill_pathname_join(directory,settings->input_remapping_directory,core_name,PATH_MAX_LENGTH); diff --git a/menu/menu_entries.c b/menu/menu_entries.c index 838dc60dee..f3a72b448e 100644 --- a/menu/menu_entries.c +++ b/menu/menu_entries.c @@ -24,6 +24,7 @@ #include "menu_entries.h" #include "../general.h" +#include "../system.h" menu_entries_t *menu_entries_get_ptr(void) { @@ -101,17 +102,18 @@ bool menu_entries_show_back(void) * (shown at the top of the UI). */ void menu_entries_get_core_title(char *s, size_t len) { - global_t *global = global_get_ptr(); - const char *core_name = global ? global->menu.info.library_name : NULL; - const char *core_version = global ? global->menu.info.library_version : NULL; + global_t *global = global_get_ptr(); + const char *core_name = global ? global->menu.info.library_name : NULL; + const char *core_version = global ? global->menu.info.library_version : NULL; + struct retro_system_info *info = rarch_system_info_get_ptr(); if (!core_name || core_name[0] == '\0') - core_name = global->system.info.library_name; + core_name = info->library_name; if (!core_name || core_name[0] == '\0') core_name = menu_hash_to_str(MENU_VALUE_NO_CORE); if (!core_version) - core_version = global->system.info.library_version; + core_version = info->library_version; if (!core_version) core_version = "";