dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2025-03-21 18:21:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Linux: Fix fallback to look for gamedata in /usr/local/games/doom3/

Browse source 
Before checking there I look for gamedata next to the executable, but
the check was broken: I got the directory the executable is in and
checked if it exists.. well.. of course it does, but that doesn't mean
there's game data in it..
So now I check if that directory actually has a "base/" subdirectory
(or whatever is #defined in BASE_GAMEDIR) and if that fails
/usr/local/games/doom3/ is tried instead.

Thanks chungy for pointing the bug out in #97 !
This commit is contained in:
Daniel Gibson 2015-09-30 15:07:51 +02:00
parent 6ba1b71fb1
commit c333a46373
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
neo/sys/linux/main.cpp
View file

@ -65,7 +65,9 @@ bool Sys_GetPath(sysPath_t type, idStr &path) {
// try next to the executable..
if (Sys_GetPath(PATH_EXE, path)) {
path = path.StripFilename();
if (stat(path.c_str(), &st) != -1 && S_ISDIR(st.st_mode)) {
// the path should have a base dir in it, otherwise it probably just contains the executable
idStr testPath = path + "/" BASE_GAMEDIR;
if (stat(testPath.c_str(), &st) != -1 && S_ISDIR(st.st_mode)) {
common->Warning("using path of executable: %s", path.c_str());
return true;
} else {
@ -75,7 +77,7 @@ bool Sys_GetPath(sysPath_t type, idStr &path) {
// fallback to vanilla doom3 install
if (stat(LINUX_DEFAULT_PATH, &st) != -1 && S_ISDIR(st.st_mode)) {
common->Warning("using hardcoded default base path");
common->Warning("using hardcoded default base path: " LINUX_DEFAULT_PATH);
path = LINUX_DEFAULT_PATH;
return true;