diff --git a/engine/common/launcher.c b/engine/common/launcher.c index 9a689b57..bc7b0426 100644 --- a/engine/common/launcher.c +++ b/engine/common/launcher.c @@ -29,36 +29,26 @@ GNU General Public License for more details. #error "Single-binary or dedicated builds aren't supported for Windows!" #endif -static char szGameDir[128]; // safe place to keep gamedir -static int szArgc; -static char **szArgv; +static int szArgc; +static char **szArgv; static void Sys_ChangeGame( const char *progname ) { // stub } -static int Sys_Start( void ) -{ - Q_strncpy( szGameDir, XASH_GAMEDIR, sizeof( szGameDir )); - -#if XASH_IOS - IOS_LaunchDialog(); - szArgc = IOS_GetArgs( &szArgv ); -#endif // XASH_IOS - - return Host_Main( szArgc, szArgv, szGameDir, 0, Sys_ChangeGame ); -} - int main( int argc, char **argv ) { #if XASH_PSVITA // inject -dev -console into args if required szArgc = PSVita_GetArgv( argc, argv, &szArgv ); +#elif XASH_IOS + IOS_LaunchDialog(); + szArgc = IOS_GetArgs( &szArgv ); #else szArgc = argc; szArgv = argv; #endif // XASH_PSVITA - return Sys_Start(); + return Host_Main( szArgc, szArgv, XASH_GAMEDIR, 0, Sys_ChangeGame ); } #endif // XASH_ENABLE_MAIN diff --git a/game_launch/game.cpp b/game_launch/game.cpp index 1edf09f9..7f33ab5e 100644 --- a/game_launch/game.cpp +++ b/game_launch/game.cpp @@ -52,7 +52,6 @@ typedef void (*pfnShutdown)( void ); static pfnInit Host_Main; static pfnShutdown Host_Shutdown = NULL; -static char szGameDir[128]; // safe place to keep gamedir static int szArgc; static char **szArgv; static HINSTANCE hEngine; @@ -172,12 +171,8 @@ static int Sys_Start( void ) setenv( "XASH3D_RODIR", "/usr/share/harbour-xash3d-fwgs/rodir", true ); #endif // XASH_SAILFISH - strncpy( szGameDir, XASH_GAMEDIR, sizeof( szGameDir ) - 1 ); - Sys_LoadEngine(); - - ret = Host_Main( szArgc, szArgv, szGameDir, 0, XASH_DISABLE_MENU_CHANGEGAME ? NULL : Sys_ChangeGame ); - + ret = Host_Main( szArgc, szArgv, XASH_GAMEDIR, 0, XASH_DISABLE_MENU_CHANGEGAME ? NULL : Sys_ChangeGame ); Sys_UnloadEngine(); return ret;