mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 23:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

(PS3) Load Game History works on PS3 - Multiman will from now on

Browse Source 
have to supply its own SELF path to argv[2] in order to work
This commit is contained in:
twinaphex 2013-04-29 15:19:16 +02:00
parent 455167ec19
commit ded204ce19
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/platform/platform_ps3.c
View File

@ -200,7 +200,8 @@ static void get_environment_settings(int argc, char *argv[])
#ifdef HAVE_MULTIMAN #ifdef HAVE_MULTIMAN
/* not launched from external launcher, set default path */ /* not launched from external launcher, set default path */
if(path_file_exists(MULTIMAN_SELF_FILE) && argc > 1 && path_file_exists(argv[1])) // second param is multiMAN SELF file
if(path_file_exists(argv[2]) && argc > 1 && (strcmp(argv[2], EMULATOR_CONTENT_DIR) == 0))
{ {
g_extern.lifecycle_mode_state |= (1ULL << MODE_EXTLAUNCH_MULTIMAN); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXTLAUNCH_MULTIMAN);
RARCH_LOG("Started from multiMAN, auto-game start enabled.\n"); RARCH_LOG("Started from multiMAN, auto-game start enabled.\n");
@ -341,17 +342,14 @@ static void system_init(void)
static int system_process_args(int argc, char *argv[]) static int system_process_args(int argc, char *argv[])
{ {
int ret = 0; if (argc > 1)
#ifdef HAVE_MULTIMAN
if (g_extern.lifecycle_mode_state & (1ULL << MODE_EXTLAUNCH_MULTIMAN))
{ {
RARCH_LOG("Started from multiMAN, will auto-start game.\n"); RARCH_LOG("Auto-start game %s.\n", argv[1]);
strlcpy(g_extern.fullpath, argv[1], sizeof(g_extern.fullpath)); strlcpy(g_extern.fullpath, argv[1], sizeof(g_extern.fullpath));
ret = 1; return 1;
} }
#endif
return ret; return 0;
} }
static void system_deinit(void) static void system_deinit(void)

15
frontend/platform/platform_ps3_exec.c
View File

@ -31,16 +31,19 @@ static void rarch_console_exec(const char *path, bool should_load_game)
RARCH_LOG("Attempt to load executable: [%s].\n", path); RARCH_LOG("Attempt to load executable: [%s].\n", path);
char spawn_data[256]; char spawn_data[256];
char game_path[256];
for(unsigned int i = 0; i < sizeof(spawn_data); ++i) for(unsigned int i = 0; i < sizeof(spawn_data); ++i)
spawn_data[i] = i & 0xff; spawn_data[i] = i & 0xff;
char spawn_data_size[16]; #ifndef IS_SALAMANDER
snprintf(spawn_data_size, sizeof(spawn_data_size), "%d", 256); if (should_load_game)
strlcpy(game_path, g_extern.fullpath, sizeof(game_path));
#endif
const char * const spawn_argv[] = { const char * const spawn_argv[] = {
spawn_data_size, #ifndef IS_SALAMANDER
"test argv for", game_path,
"sceNpDrmProcessExitSpawn2()", #endif
NULL NULL
}; };
@ -50,7 +53,7 @@ static void rarch_console_exec(const char *path, bool should_load_game)
if(ret < 0) if(ret < 0)
{ {
RARCH_WARN("SELF file is not of NPDRM type, trying another approach to boot it...\n"); RARCH_WARN("SELF file is not of NPDRM type, trying another approach to boot it...\n");
sys_game_process_exitspawn(path, NULL, NULL, NULL, 0, 1000, SYS_PROCESS_PRIMARY_STACK_SIZE_1M); sys_game_process_exitspawn(path, (const char** const)spawn_argv, NULL, NULL, 0, 1000, SYS_PROCESS_PRIMARY_STACK_SIZE_1M);
} }
sceNpTerm(); sceNpTerm();