vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

engine: Make SDL_GetBasePath error not fatal

Browse source
This commit is contained in:
mittorn 2023-10-21 19:39:02 +03:00 • committed by Alibek Omarov
parent 1bfb6c560a
commit bee81e9723
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
engine/common/host.c
View file

@ -1025,12 +1025,21 @@ void Host_InitCommon( int argc, char **argv, const char *progname, qboolean bCha
host.rootdir[0] = 0; host.rootdir[0] = 0;
} }
#elif (XASH_SDL == 2) && !XASH_NSWITCH // GetBasePath not impl'd in switch-sdl2 #elif (XASH_SDL == 2) && !XASH_NSWITCH // GetBasePath not impl'd in switch-sdl2
char *szBasePath; char *szBasePath = SDL_GetBasePath();
if( szBasePath )
if( !( szBasePath = SDL_GetBasePath() ) ) {
Q_strncpy( host.rootdir, szBasePath, sizeof( host.rootdir ));
SDL_free( szBasePath );
}
else
{
#if XASH_POSIX || XASH_WIN32
if( !getcwd( host.rootdir, sizeof( host.rootdir )))
Sys_Error( "couldn't determine current directory: %s, getcwd: %s", SDL_GetError(), strerror( errno ));
#else
Sys_Error( "couldn't determine current directory: %s", SDL_GetError() ); Sys_Error( "couldn't determine current directory: %s", SDL_GetError() );
Q_strncpy( host.rootdir, szBasePath, sizeof( host.rootdir )); #endif
SDL_free( szBasePath ); }
#else #else
if( !getcwd( host.rootdir, sizeof( host.rootdir ))) if( !getcwd( host.rootdir, sizeof( host.rootdir )))
{ {