dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2024-11-30 16:11:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Load base game's gamelib if mod has no own gamelib

Browse source 
Some mods/mappacks have their own game dir (fs_game) but no own gamelib.
Doom3 defaulted to the base game dll (I think), so we should do the same.

Fixes #44
This commit is contained in:
Daniel Gibson 2012-09-09 23:36:53 +02:00
parent c193e0b98e
commit 768fdb5707
1 changed files with 50 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
neo/framework/Common.cpp
View file

@ -186,6 +186,7 @@ private:
void DumpWarnings( void ); void DumpWarnings( void );
void SingleAsyncTic( void ); void SingleAsyncTic( void );
void LoadGameDLL( void ); void LoadGameDLL( void );
void LoadGameDLLbyName( const char *dll, idStr& s );
void UnloadGameDLL( void ); void UnloadGameDLL( void );
void PrintLoadingMessage( const char *msg ); void PrintLoadingMessage( const char *msg );
void FilterLangList( idStrList* list, idStr lang ); void FilterLangList( idStrList* list, idStr lang );
@ -2541,6 +2542,49 @@ void idCommonLocal::Async( void ) {
} }
} }
/*
=================
idCommonLocal::LoadGameDLLbyName
Helper for LoadGameDLL() to make it less painfull to try different dll names.
=================
*/
void idCommonLocal::LoadGameDLLbyName( const char *dll, idStr& s ) {
s.CapLength(0);
// try next to the binary first (build tree)
if (Sys_GetPath(PATH_EXE, s)) {
// "s = " seems superfluous, but works around g++ 4.7 bug else StripFilename()
// (and possibly even CapLength()) seems to be "optimized" away and the string contains garbage
s = s.StripFilename();
s.AppendPath(dll);
gameDLL = sys->DLL_Load(s);
}
#if defined(_WIN32)
// then the lib/ dir relative to the binary on windows
if (!gameDLL && Sys_GetPath(PATH_EXE, s)) {
s.StripFilename();
s.AppendPath("lib");
s.AppendPath(dll);
gameDLL = sys->DLL_Load(s);
}
#elif defined(MACOS_X)
// then the binary dir in the bundle on osx
if (!gameDLL && Sys_GetPath(PATH_EXE, s)) {
s.StripFilename();
s.AppendPath(dll);
gameDLL = sys->DLL_Load(s);
}
#else
// then the install folder on *nix
if (!gameDLL) {
s = BUILD_LIBDIR;
s.AppendPath(dll);
gameDLL = sys->DLL_Load(s);
}
#endif
}
/* /*
================= =================
idCommonLocal::LoadGameDLL idCommonLocal::LoadGameDLL
@ -2561,38 +2605,16 @@ void idCommonLocal::LoadGameDLL( void ) {
fs_game = BASE_GAMEDIR; fs_game = BASE_GAMEDIR;
gameDLL = 0; gameDLL = 0;
sys->DLL_GetFileName(fs_game, dll, sizeof(dll)); sys->DLL_GetFileName(fs_game, dll, sizeof(dll));
LoadGameDLLbyName(dll, s);
// try next to the binary first (build tree) // there was no gamelib for this mod, use default one from base game
if (Sys_GetPath(PATH_EXE, s)) {
s.StripFilename();
s.AppendPath(dll);
gameDLL = sys->DLL_Load(s);
}
#if defined(_WIN32)
// then the lib/ dir relative to the binary on windows
if (!gameDLL && Sys_GetPath(PATH_EXE, s)) {
s.StripFilename();
s.AppendPath("lib");
s.AppendPath(dll);
gameDLL = sys->DLL_Load(s);
}
#elif defined(MACOS_X)
// then the binary dir in the bundle on osx
if (!gameDLL && Sys_GetPath(PATH_EXE, s)) {
s.StripFilename();
s.AppendPath(dll);
gameDLL = sys->DLL_Load(s);
}
#else
// then the install folder on *nix
if (!gameDLL) { if (!gameDLL) {
s = BUILD_LIBDIR; common->Warning( "couldn't load mod-specific %s, defaulting to base game's library!", dll );
s.AppendPath(dll); sys->DLL_GetFileName(BASE_GAMEDIR, dll, sizeof(dll));
gameDLL = sys->DLL_Load(s); LoadGameDLLbyName(dll, s);
} }
#endif
if ( !gameDLL ) { if ( !gameDLL ) {
common->FatalError( "couldn't load game dynamic library" ); common->FatalError( "couldn't load game dynamic library" );