ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libretro_no_rom becomes libretro_no_content

This commit is contained in:
twinaphex 2014-07-28 19:51:17 +02:00
parent f9b7431289
commit 4d198dffaa
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
file.c
View File

@ -443,7 +443,7 @@ bool init_rom_file(void)
attr.i = g_extern.system.info.block_extract; attr.i = g_extern.system.info.block_extract;
attr.i |= g_extern.system.info.need_fullpath << 1; attr.i |= g_extern.system.info.need_fullpath << 1;
attr.i |= (!g_extern.system.no_game) << 2; attr.i |= (!g_extern.system.no_game) << 2;
string_list_append(content, g_extern.libretro_no_rom ? "" : g_extern.fullpath, attr); string_list_append(content, g_extern.libretro_no_content ? "" : g_extern.fullpath, attr);
} }
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB

2
general.h
View File

@ -709,7 +709,7 @@ struct global
jmp_buf error_sjlj_context; jmp_buf error_sjlj_context;
unsigned menu_toggle_behavior; unsigned menu_toggle_behavior;
bool libretro_no_rom; bool libretro_no_content;
bool libretro_dummy; bool libretro_dummy;
// Config file associated with per-core configs. // Config file associated with per-core configs.

14
retroarch.c
View File

@ -756,7 +756,7 @@ static void print_help(void)
#endif #endif
print_compiler(stdout); print_compiler(stdout);
puts("==================================================================="); puts("===================================================================");
puts("Usage: retroarch [rom file] [options...]"); puts("Usage: retroarch [content file] [options...]");
puts("\t-h/--help: Show this help message."); puts("\t-h/--help: Show this help message.");
puts("\t--menu: Do not require content or libretro core to be loaded, starts directly in menu."); puts("\t--menu: Do not require content or libretro core to be loaded, starts directly in menu.");
puts("\t\tIf no arguments are passed to RetroArch, it is equivalent to using --menu as only argument."); puts("\t\tIf no arguments are passed to RetroArch, it is equivalent to using --menu as only argument.");
@ -812,7 +812,7 @@ static void print_help(void)
puts("\t-U/--ups: Specifies path for UPS patch that will be applied to ROM."); puts("\t-U/--ups: Specifies path for UPS patch that will be applied to ROM.");
puts("\t--bps: Specifies path for BPS patch that will be applied to ROM."); puts("\t--bps: Specifies path for BPS patch that will be applied to ROM.");
puts("\t--ips: Specifies path for IPS patch that will be applied to ROM."); puts("\t--ips: Specifies path for IPS patch that will be applied to ROM.");
puts("\t--no-patch: Disables all forms of rom patching."); puts("\t--no-patch: Disables all forms of content patching.");
puts("\t-D/--detach: Detach RetroArch from the running console. Not relevant for all platforms.\n"); puts("\t-D/--detach: Detach RetroArch from the running console. Not relevant for all platforms.\n");
} }
@ -888,7 +888,7 @@ static void set_paths(const char *path)
static void parse_input(int argc, char *argv[]) static void parse_input(int argc, char *argv[])
{ {
g_extern.libretro_no_rom = false; g_extern.libretro_no_content = false;
g_extern.libretro_dummy = false; g_extern.libretro_dummy = false;
g_extern.has_set_save_path = false; g_extern.has_set_save_path = false;
g_extern.has_set_state_path = false; g_extern.has_set_state_path = false;
@ -1260,7 +1260,7 @@ static void parse_input(int argc, char *argv[])
else if (*g_extern.subsystem && optind < argc) else if (*g_extern.subsystem && optind < argc)
set_special_paths(argv + optind, argc - optind); set_special_paths(argv + optind, argc - optind);
else else
g_extern.libretro_no_rom = true; g_extern.libretro_no_content = true;
// Copy SRM/state dirs used, so they can be reused on reentrancy. // Copy SRM/state dirs used, so they can be reused on reentrancy.
if (g_extern.has_set_save_path && path_is_directory(g_extern.savefile_name)) if (g_extern.has_set_save_path && path_is_directory(g_extern.savefile_name))
@ -2922,10 +2922,10 @@ int rarch_main_init(int argc, char *argv[])
verify_api_version(); verify_api_version();
pretro_init(); pretro_init();
g_extern.use_sram = !g_extern.libretro_dummy && !g_extern.libretro_no_rom; g_extern.use_sram = !g_extern.libretro_dummy && !g_extern.libretro_no_content;
bool allow_cheats = true; bool allow_cheats = true;
if (g_extern.libretro_no_rom && !g_extern.libretro_dummy) if (g_extern.libretro_no_content && !g_extern.libretro_dummy)
{ {
if (!init_rom_file()) if (!init_rom_file())
goto error; goto error;
@ -3252,7 +3252,7 @@ void rarch_main_deinit(void)
deinit_movie(); deinit_movie();
#endif #endif
if (!g_extern.libretro_dummy && !g_extern.libretro_no_rom) if (!g_extern.libretro_dummy && !g_extern.libretro_no_content)
save_auto_state(); save_auto_state();
uninit_drivers(); uninit_drivers();