diff options
| author | Max Horn | 2008-09-07 15:16:45 +0000 |
|---|---|---|
| committer | Max Horn | 2008-09-07 15:16:45 +0000 |
| commit | f5462901b24f5a1191f3d68d866e4ee75a006347 (patch) | |
| tree | b618e411a236138e8b61550b2751d341b154807d | |
| parent | b3a48455db2a13a740f4c4241c9a9c09c681c7bd (diff) | |
| download | scummvm-rg350-f5462901b24f5a1191f3d68d866e4ee75a006347.tar.gz scummvm-rg350-f5462901b24f5a1191f3d68d866e4ee75a006347.tar.bz2 scummvm-rg350-f5462901b24f5a1191f3d68d866e4ee75a006347.zip | |
Temporary workaround for bug #2098279: ALL: Game path with no trailing backslash fails
svn-id: r34408
| -rw-r--r-- | engines/engine.cpp | 6 | ||||
| -rw-r--r-- | engines/kyra/resource.cpp | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/engines/engine.cpp b/engines/engine.cpp index 4840b19838..95081e6645 100644 --- a/engines/engine.cpp +++ b/engines/engine.cpp @@ -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) { diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp index bfd8b6a91c..340d9e0d1c 100644 --- a/engines/kyra/resource.cpp +++ b/engines/kyra/resource.cpp @@ -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'"); |