[Scummvm-cvs-logs] SF.net SVN: scummvm:[34408] scummvm/trunk/engines
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sun Sep 7 17:16:46 CEST 2008
Revision: 34408
http://scummvm.svn.sourceforge.net/scummvm/?rev=34408&view=rev
Author: fingolfin
Date: 2008-09-07 15:16:45 +0000 (Sun, 07 Sep 2008)
Log Message:
-----------
Temporary workaround for bug #2098279: ALL: Game path with no trailing backslash fails
Modified Paths:
--------------
scummvm/trunk/engines/engine.cpp
scummvm/trunk/engines/kyra/resource.cpp
Modified: scummvm/trunk/engines/engine.cpp
===================================================================
--- scummvm/trunk/engines/engine.cpp 2008-09-07 13:40:30 UTC (rev 34407)
+++ scummvm/trunk/engines/engine.cpp 2008-09-07 15:16:45 UTC (rev 34408)
@@ -56,7 +56,11 @@
_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) {
Modified: scummvm/trunk/engines/kyra/resource.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource.cpp 2008-09-07 13:40:30 UTC (rev 34407)
+++ scummvm/trunk/engines/kyra/resource.cpp 2008-09-07 15:16:45 UTC (rev 34408)
@@ -79,8 +79,8 @@
} 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 @@
}
// 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'");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list