aboutsummaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorMax Horn2006-05-12 21:41:54 +0000
committerMax Horn2006-05-12 21:41:54 +0000
commit3623a94927a3d01b6df5c75f42af13a348327c2a (patch)
tree6c6109147fdbf77457c7b107e3d494fc5a66332c /base
parented339aa771fa7f47a737c0599197dbe205804338 (diff)
downloadscummvm-rg350-3623a94927a3d01b6df5c75f42af13a348327c2a.tar.gz
scummvm-rg350-3623a94927a3d01b6df5c75f42af13a348327c2a.tar.bz2
scummvm-rg350-3623a94927a3d01b6df5c75f42af13a348327c2a.zip
Added the new AbstractFilesystemNode::getCurrentDirectory() method. Also changed the semantics of the FilesystemNode constructors (see also the relevant doxygen comments for explanations). This also fixes bug #1485941.
svn-id: r22424
Diffstat (limited to 'base')
-rw-r--r--base/main.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/base/main.cpp b/base/main.cpp
index 292b57afdd..683431b3c1 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -164,11 +164,15 @@ static const Plugin *detectMain() {
return 0;
}
+ // FIXME: Do we really need this one?
printf("Trying to start game '%s'\n", game.description.c_str());
+ return plugin;
+}
+
+static int runGame(const Plugin *plugin, OSystem &system, const Common::String &edebuglevels) {
Common::String gameDataPath(ConfMan.get("path"));
if (gameDataPath.empty()) {
- warning("No path was provided. Assuming the data files are in the current directory");
} else if (gameDataPath.lastChar() != '/'
#if defined(__MORPHOS__) || defined(__amigaos4__)
&& gameDataPath.lastChar() != ':'
@@ -178,10 +182,6 @@ static const Plugin *detectMain() {
ConfMan.set("path", gameDataPath, Common::ConfigManager::kTransientDomain);
}
- return plugin;
-}
-
-static int runGame(const Plugin *plugin, OSystem &system, const Common::String &edebuglevels) {
// We add it here, so MD5-based detection will be able to
// read mixed case files
if (ConfMan.hasKey("path")) {
@@ -193,6 +193,7 @@ static int runGame(const Plugin *plugin, OSystem &system, const Common::String &
}
Common::File::addDefaultDirectory(path);
} else {
+ warning("No path was provided. Assuming the data files are in the current directory");
Common::File::addDefaultDirectory(".");
}