mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename rom variables in main_wrap struct

Browse Source
This commit is contained in:
twinaphex 2014-07-28 19:55:28 +02:00
parent 4d198dffaa
commit dfeab30f26
8 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/menu/menu_common.c
View File

@ -183,12 +183,12 @@ static void menu_environment_get(int *argc, char *argv[], void *args, void *para
{
struct rarch_main_wrap *wrap_args = (struct rarch_main_wrap*)params_data;
wrap_args->no_rom = driver.menu->load_no_content;
wrap_args->no_content = driver.menu->load_no_content;
wrap_args->verbose = g_extern.verbosity;
wrap_args->config_path = *g_extern.config_path ? g_extern.config_path : NULL;
wrap_args->sram_path = *g_extern.savefile_dir ? g_extern.savefile_dir : NULL;
wrap_args->state_path = *g_extern.savestate_dir ? g_extern.savestate_dir : NULL;
wrap_args->rom_path = *g_extern.fullpath ? g_extern.fullpath : NULL;
wrap_args->content_path = *g_extern.fullpath ? g_extern.fullpath : NULL;
wrap_args->libretro_path = *g_settings.libretro ? g_settings.libretro : NULL;
wrap_args->touched = true;
}

4
frontend/platform/platform_android.c
View File

@ -464,7 +464,7 @@ static void frontend_android_get_environment_settings(int *argc, char *argv[],
if (args)
{
args->touched = true;
args->no_rom = false;
args->no_content = false;
args->verbose = false;
args->sram_path = NULL;
args->state_path = NULL;
@ -549,7 +549,7 @@ static void frontend_android_get_environment_settings(int *argc, char *argv[],
{
RARCH_LOG("Auto-start game %s.\n", path);
if (args && *path)
args->rom_path = path;
args->content_path = path;
}
}

4
frontend/platform/platform_gx.c
View File

@ -209,12 +209,12 @@ static void frontend_gx_get_environment_settings(int *argc, char *argv[],
fill_pathname_join(path, argv[1], argv[2], sizeof(path));
args->touched = true;
args->no_rom = false;
args->no_content = false;
args->verbose = false;
args->config_path = NULL;
args->sram_path = NULL;
args->state_path = NULL;
args->rom_path = path;
args->content_path = path;
args->libretro_path = NULL;
}
}

4
frontend/platform/platform_ps3.c
View File

@ -122,12 +122,12 @@ static void frontend_ps3_get_environment_settings(int *argc, char *argv[],
strlcpy(path, argv[1], sizeof(path));
args->touched = true;
args->no_rom = false;
args->no_content = false;
args->verbose = false;
args->config_path = NULL;
args->sram_path = NULL;
args->state_path = NULL;
args->rom_path = path;
args->content_path = path;
args->libretro_path = NULL;
RARCH_LOG("argv[0]: %s\n", argv[0]);

4
frontend/platform/platform_psp.c
View File

@ -84,12 +84,12 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[],
strlcpy(path, argv[1], sizeof(path));
args->touched = true;
args->no_rom = false;
args->no_content = false;
args->verbose = false;
args->config_path = NULL;
args->sram_path = NULL;
args->state_path = NULL;
args->rom_path = path;
args->content_path = path;
args->libretro_path = NULL;
RARCH_LOG("argv[0]: %s\n", argv[0]);

4
frontend/platform/platform_xdk.c
View File

@ -208,12 +208,12 @@ static void frontend_xdk_get_environment_settings(int *argc, char *argv[],
if (args)
{
args->touched = true;
args->no_rom = false;
args->no_content = false;
args->verbose = false;
args->config_path = NULL;
args->sram_path = NULL;
args->state_path = NULL;
args->rom_path = path;
args->content_path = path;
args->libretro_path = NULL;
RARCH_LOG("Auto-start game %s.\n", path);

4
general.h
View File

@ -718,13 +718,13 @@ struct global
struct rarch_main_wrap
{
const char *rom_path;
const char *content_path;
const char *sram_path;
const char *state_path;
const char *config_path;
const char *libretro_path;
bool verbose;
bool no_rom;
bool no_content;
bool touched;
};

8
retroarch.c
View File

@ -3286,12 +3286,12 @@ void rarch_main_init_wrap(const struct rarch_main_wrap *args, int *argc, char **
*argc = 0;
argv[(*argc)++] = strdup("retroarch");
if (!args->no_rom)
if (!args->no_content)
{
if (args->rom_path)
if (args->content_path)
{
RARCH_LOG("Using content: %s.\n", args->rom_path);
argv[(*argc)++] = strdup(args->rom_path);
RARCH_LOG("Using content: %s.\n", args->content_path);
argv[(*argc)++] = strdup(args->content_path);
}
else
{