diff --git a/console/rarch_console_rom_ext.c b/console/rarch_console_rom_ext.c index 1675dcd66a..156272e28a 100644 --- a/console/rarch_console_rom_ext.c +++ b/console/rarch_console_rom_ext.c @@ -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) diff --git a/console/rarch_console_settings.c b/console/rarch_console_settings.c index 87a6319a7b..043b870a5c 100644 --- a/console/rarch_console_settings.c +++ b/console/rarch_console_settings.c @@ -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: diff --git a/frontend/frontend_console.c b/frontend/frontend_console.c index a965dedca4..d1a54a9bb1 100644 --- a/frontend/frontend_console.c +++ b/frontend/frontend_console.c @@ -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); diff --git a/frontend/platform/platform_ps3.c b/frontend/platform/platform_ps3.c index b014ea5407..7134b3b555 100644 --- a/frontend/platform/platform_ps3.c +++ b/frontend/platform/platform_ps3.c @@ -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 diff --git a/general.h b/general.h index 08dfdcff69..f53ddaac06 100644 --- a/general.h +++ b/general.h @@ -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;