q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2025-02-16 23:20:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a mismerge.

Browse Source 
(But I still need to figure out what I'm doing between SetAbsolutePath() and
whatever I had before...)
This commit is contained in:
Ryan C. Gordon 2016-04-04 22:40:30 -04:00
parent 3adda272b7
commit c752e7cace
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Engine/Base/Stream.cpp
View File

@ -1570,12 +1570,14 @@ INDEX ExpandFilePath(ULONG ulType, const CTFileName &fnmFile, CTFileName &fnmExp
// do that // do that
fnmExpanded = _fnmApplicationPath+_fnmMod+fnmFileAbsolute; fnmExpanded = _fnmApplicationPath+_fnmMod+fnmFileAbsolute;
fnmExpanded.SetAbsolutePath(); fnmExpanded.SetAbsolutePath();
VerifyDirsExist(fnmExpanded.FileDir());
return EFP_FILE; return EFP_FILE;
// if should not write to mod dir // if should not write to mod dir
} else { } else {
// write to base dir // write to base dir
fnmExpanded = _fnmApplicationPath+fnmFileAbsolute; fnmExpanded = _fnmApplicationPath+fnmFileAbsolute;
fnmExpanded.SetAbsolutePath(); fnmExpanded.SetAbsolutePath();
VerifyDirsExist(fnmExpanded.FileDir());
return EFP_FILE; return EFP_FILE;
} }