(RARCH_CONSOLE) Use g_extern.fullpath

This commit is contained in:
twinaphex 2013-01-09 06:40:55 +01:00
parent b074adbc1d
commit 8fdc5197f5
5 changed files with 4 additions and 8 deletions

View File

@ -242,7 +242,7 @@ void rarch_console_load_game_wrap(const char *path, unsigned extract_zip_mode, u
if(load_game)
{
snprintf(g_extern.file_state.rom_path, sizeof(g_extern.file_state.rom_path), game_to_load);
snprintf(g_extern.fullpath, sizeof(g_extern.fullpath), game_to_load);
rarch_settings_change(S_START_RARCH);
if(g_extern.console.rmenu.state.msg_info.enable)

View File

@ -233,7 +233,7 @@ void rarch_settings_msg(unsigned setting, unsigned delay)
}
break;
case S_MSG_LOADING_ROM:
fill_pathname_base(tmp, g_extern.file_state.rom_path, sizeof(tmp));
fill_pathname_base(tmp, g_extern.fullpath, sizeof(tmp));
snprintf(str, sizeof(str), "INFO - Loading %s...", tmp);
break;
case S_MSG_DIR_LOADING_ERROR:

View File

@ -276,7 +276,7 @@ begin_loop:
args.config_path = g_extern.config_path;
args.sram_path = g_extern.console.main_wrap.state.default_sram_dir.enable ? g_extern.console.main_wrap.paths.default_sram_dir : NULL,
args.state_path = g_extern.console.main_wrap.state.default_savestate_dir.enable ? g_extern.console.main_wrap.paths.default_savestate_dir : NULL,
args.rom_path = g_extern.file_state.rom_path;
args.rom_path = g_extern.fullpath;
args.libretro_path = g_settings.libretro;
int init_ret = rarch_main_init_wrap(&args);

View File

@ -402,7 +402,7 @@ static void system_process_args(int argc, char *argv[])
#ifdef HAVE_MULTIMAN
case EXTERN_LAUNCHER_MULTIMAN:
RARCH_LOG("Started from multiMAN, will auto-start game.\n");
strlcpy(g_extern.file_state.rom_path, argv[1], sizeof(g_extern.file_state.rom_path));
strlcpy(g_extern.fullpath, argv[1], sizeof(g_extern.fullpath));
rarch_settings_change(S_START_RARCH);
break;
#endif

View File

@ -566,14 +566,10 @@ struct global
struct
{
char rom_path[PATH_MAX];
char cgp_path[PATH_MAX];
char input_cfg_path[PATH_MAX];
#ifdef HAVE_ZLIB
unsigned zip_extract_mode;
#endif
#ifdef _XBOX
DWORD volume_device_type;
#endif
} file_state;