(PS3) Fixes 'Return To Multiman' option

This commit is contained in:
twinaphex 2013-05-28 22:15:21 +02:00
parent 67bcd157fd
commit 360184d49e
3 changed files with 8 additions and 1 deletions

View File

@ -79,6 +79,11 @@
<type>2</type>
<locationURI>PARENT-2-PROJECT_LOC/media/overlays</locationURI>
</link>
<link>
<name>shaders_glsl</name>
<type>2</type>
<locationURI>PARENT-2-PROJECT_LOC/media/shaders_glsl</locationURI>
</link>
<link>
<name>src/griffin.c</name>
<type>1</type>

View File

@ -32,6 +32,7 @@ int rarch_main(int argc, char *argv[])
strlcpy(g_settings.libretro, "app/native/lib", sizeof(g_settings.libretro));
#endif
strlcpy(g_extern.config_path, "app/native/retroarch.cfg", sizeof(g_extern.config_path));
strlcpy(g_settings.video.shader_dir, "app/native/shaders_glsl", sizeof(g_settings.video.shader_dir));
config_load();

View File

@ -395,14 +395,15 @@ static void system_exitspawn(void)
cellSysmoduleLoadModule(CELL_SYSMODULE_IO);
#else
char core_launch[256];
strlcpy(core_launch, g_settings.libretro, sizeof(core_launch));
#ifdef HAVE_MULTIMAN
if (g_extern.lifecycle_mode_state & (1ULL << MODE_EXITSPAWN_MULTIMAN))
{
RARCH_LOG("Boot Multiman: %s.\n", MULTIMAN_SELF_FILE);
strlcpy(core_launch, MULTIMAN_SELF_FILE, sizeof(core_launch));
}
else
#endif
strlcpy(core_launch, g_settings.libretro, sizeof(core_launch));
bool should_load_game = false;
if (g_extern.lifecycle_mode_state & (1ULL << MODE_EXITSPAWN_START_GAME))
should_load_game = true;