mirror of
https://github.com/libretro/RetroArch
synced 2025-03-29 22:20:21 +00:00
Correct 'ret' return of process_args at least - 0 is for content
being loaded, 1 is if content is not loaded
This commit is contained in:
parent
07db4ea692
commit
83174b51c4
@ -328,14 +328,13 @@ returntype main_entry(signature())
|
||||
if ((ret = rarch_main_init(argc, argv))) return_var(ret);
|
||||
|
||||
#if defined(HAVE_MENU)
|
||||
ret = 0;
|
||||
if (driver.frontend_ctx && driver.frontend_ctx->process_args)
|
||||
ret = driver.frontend_ctx->process_args(&argc, argv, args);
|
||||
|
||||
g_extern.lifecycle_state |= (1ULL << MODE_GAME);
|
||||
|
||||
#if defined(RARCH_CONSOLE) || defined(RARCH_MOBILE)
|
||||
if (ret)
|
||||
if (!ret)
|
||||
#endif
|
||||
{
|
||||
// If we started a ROM directly from command line,
|
||||
|
@ -672,11 +672,11 @@ static int frontend_android_process_args(int *argc, char *argv[], void *args)
|
||||
struct android_app* android_app = (struct android_app*)g_android;
|
||||
|
||||
if (!android_app)
|
||||
return 0;
|
||||
return 1;
|
||||
|
||||
env = jni_thread_getenv();
|
||||
if (!env)
|
||||
return 0;
|
||||
return 1;
|
||||
|
||||
CALL_OBJ_METHOD(env, obj, android_app->activity->clazz, android_app->getIntent);
|
||||
|
||||
@ -692,10 +692,10 @@ static int frontend_android_process_args(int *argc, char *argv[], void *args)
|
||||
|
||||
g_extern.lifecycle_state |= (1ULL << MODE_LOAD_GAME);
|
||||
RARCH_LOG("Auto-start game %s.\n", g_extern.fullpath);
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
const frontend_ctx_driver_t frontend_ctx_android = {
|
||||
|
@ -350,7 +350,7 @@ static void frontend_gx_exitspawn(void)
|
||||
|
||||
static int frontend_gx_process_args(int *argc, char *argv[], void *args)
|
||||
{
|
||||
int ret = 0;
|
||||
int ret = 1;
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
// a big hack: sometimes salamander doesn't save the new core it loads on first boot,
|
||||
@ -365,7 +365,7 @@ static int frontend_gx_process_args(int *argc, char *argv[], void *args)
|
||||
if (*argc > 2 && argv[1] != NULL && argv[2] != NULL)
|
||||
{
|
||||
fill_pathname_join(g_extern.fullpath, argv[1], argv[2], sizeof(g_extern.fullpath));
|
||||
ret = 1;
|
||||
ret = 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@ -331,7 +331,7 @@ static void frontend_ps3_init(void *data)
|
||||
|
||||
static int frontend_ps3_process_args(int *argc, char *argv[], void *args)
|
||||
{
|
||||
int ret = 0;
|
||||
int ret = 1;
|
||||
#ifndef IS_SALAMANDER
|
||||
bool original_verbose = g_extern.verbose;
|
||||
g_extern.verbose = true;
|
||||
@ -339,7 +339,7 @@ static int frontend_ps3_process_args(int *argc, char *argv[], void *args)
|
||||
if (*argc > 1)
|
||||
{
|
||||
strlcpy(g_extern.fullpath, argv[1], sizeof(g_extern.fullpath));
|
||||
ret = 1;
|
||||
ret = 0;
|
||||
RARCH_LOG("Auto-start game %s.\n", argv[1]);
|
||||
}
|
||||
|
||||
|
@ -116,10 +116,10 @@ static int frontend_psp_process_args(int *argc, char *argv[], void *args)
|
||||
{
|
||||
strlcpy(g_extern.fullpath, argv[1], sizeof(g_extern.fullpath));
|
||||
g_extern.lifecycle_state |= (1ULL << MODE_LOAD_GAME);
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int frontend_psp_get_rating(void)
|
||||
|
@ -287,7 +287,7 @@ static int frontend_xdk_process_args(int *argc, char *argv[], void *args)
|
||||
g_extern.verbose = true;
|
||||
#endif
|
||||
|
||||
ret = 0;
|
||||
ret = 1;
|
||||
(void)argc;
|
||||
(void)argv;
|
||||
|
||||
@ -304,7 +304,7 @@ static int frontend_xdk_process_args(int *argc, char *argv[], void *args)
|
||||
{
|
||||
snprintf(g_extern.fullpath, sizeof(g_extern.fullpath), (char*)ptr.Data);
|
||||
RARCH_LOG("Auto-start game %s.\n", g_extern.fullpath);
|
||||
ret = 1;
|
||||
ret = 0;
|
||||
goto exit;
|
||||
}
|
||||
}
|
||||
@ -319,7 +319,7 @@ static int frontend_xdk_process_args(int *argc, char *argv[], void *args)
|
||||
RARCH_LOG("Auto-start game %s.\n", g_extern.fullpath);
|
||||
|
||||
delete []pLaunchData;
|
||||
ret = 1;
|
||||
ret = 0;
|
||||
goto exit;
|
||||
}
|
||||
#endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user