thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Temporary workaround for bug #2098279: ALL: Game path with no trailing backslash fails

Browse source 
svn-id: r34408
This commit is contained in:
Max Horn 2008-09-07 15:16:45 +00:00
parent b3a48455db
commit f5462901b2
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/engine.cpp
View file

@ -56,7 +56,11 @@ Engine::Engine(OSystem *syst)
_eventMan(_system->getEventManager()),
_saveFileMan(_system->getSavefileManager()),
_targetName(ConfMan.getActiveDomainName()),
_gameDataPath(ConfMan.get("path")),
// FIXME: Temporary workaround for "missing" slashes at the end
// of _gameDataPath. This can go once we completed the transition
// to the new Archive/SearchPath system. See also bug #2098279.
_gameDataPath(ConfMan.get("path") + '/'),
_pauseLevel(0),
_mainMenuDialog(NULL) {

8
engines/kyra/resource.cpp
View file

@ -79,8 +79,8 @@ bool Resource::reset() {
} else {
if (_vm->gameFlags().isTalkie) {
// Add default file directories
Common::File::addDefaultDirectory(ConfMan.get("path") + "hof_cd");
Common::File::addDefaultDirectory(ConfMan.get("path") + "HOF_CD");
Common::File::addDefaultDirectory(ConfMan.get("path") + "/hof_cd");
Common::File::addDefaultDirectory(ConfMan.get("path") + "/HOF_CD");
}
loadPakFile("INTROGEN.PAK");
@ -95,8 +95,8 @@ bool Resource::reset() {
}
// Add default file directories
Common::File::addDefaultDirectory(ConfMan.get("path") + "malcolm");
Common::File::addDefaultDirectory(ConfMan.get("path") + "MALCOLM");
Common::File::addDefaultDirectory(ConfMan.get("path") + "/malcolm");
Common::File::addDefaultDirectory(ConfMan.get("path") + "/MALCOLM");
if (!loadFileList("FILEDATA.FDT"))
error("couldn't load file: 'FILEDATA.FDT'");