(Netplay) Small launch compatibility patch adjustments (#14251)

This commit is contained in:
Cthulhu-throwaway 2022-07-29 17:49:10 -03:00 committed by GitHub
parent aca5169416
commit 6b9a2b4bb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 48 additions and 41 deletions

View File

@ -205,20 +205,22 @@ static void frontend_ctr_deinit(void* data)
static void frontend_ctr_exec(const char *path, bool should_load_game)
{
DEBUG_VAR(path);
DEBUG_STR(path);
if (!string_is_empty(path))
{
#ifndef IS_SALAMANDER
#ifdef HAVE_NETWORKING
const char *arg_data[NETPLAY_FORK_MAX_ARGS + 1];
char *arg_data[NETPLAY_FORK_MAX_ARGS + 1];
#else
const char *arg_data[3];
char *arg_data[3];
#endif
char game_path[PATH_MAX];
#else
const char *arg_data[2];
char *arg_data[2];
#endif
DEBUG_VAR(path);
DEBUG_STR(path);
arg_data[0] = elf_path_cst;
arg_data[1] = NULL;
@ -238,11 +240,8 @@ static void frontend_ctr_exec(const char *path, bool should_load_game)
arg_data[2] = NULL;
}
}
#endif
if (!string_is_empty(path))
#else
{
#ifdef IS_SALAMANDER
struct stat sbuff;
if (stat(path, &sbuff))
@ -254,6 +253,7 @@ static void frontend_ctr_exec(const char *path, bool should_load_game)
if (string_is_empty(core_path))
error_and_quit("There are no cores installed, install a core to continue.");
}
}
#endif
if (envIsHomebrew())
@ -271,6 +271,7 @@ static void frontend_ctr_exec(const char *path, bool should_load_game)
RARCH_WARN("card may be corrupted!\n");
RARCH_WARN("\n");
RARCH_WARN("\n");
exec_cia(path, arg_data);
}

View File

@ -54,6 +54,10 @@
#include "../frontend_driver.h"
#include "../../defaults.h"
#ifndef IS_SALAMANDER
#include "../../menu/menu_entries.h"
#endif
#ifdef HW_RVL
#include <ogc/ios.h>
#include <ogc/usbstorage.h>

View File

@ -89,7 +89,9 @@ static enum frontend_fork psp_fork_mode = FRONTEND_FORK_NONE;
static void frontend_psp_get_env_settings(int *argc, char *argv[],
void *args, void *params_data)
{
#ifndef IS_SALAMANDER
struct rarch_main_wrap *params = (struct rarch_main_wrap*)params_data;
#endif
#ifdef VITA
strcpy_literal(eboot_path, "app0:/");

View File

@ -260,7 +260,7 @@ static void frontend_wiiu_exec(const char *path, bool should_load_content)
if (HBL_loadToMemory(path, (u32)arg - (u32)param) < 0)
{
RARCH_LOG("Failed to load core\n");
RARCH_ERR("Failed to load core\n");
}
else
{