aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2006-04-02 21:38:36 +0000
committerMax Horn2006-04-02 21:38:36 +0000
commit4df2948902f18b23b1cec258c9a64ec9f43a8a6e (patch)
treea15cafc3f6957e9d935c55c89b95bdf3d72db26d
parent214c01d15d2f010a662504ac4d608f38f4ba4847 (diff)
downloadscummvm-rg350-4df2948902f18b23b1cec258c9a64ec9f43a8a6e.tar.gz
scummvm-rg350-4df2948902f18b23b1cec258c9a64ec9f43a8a6e.tar.bz2
scummvm-rg350-4df2948902f18b23b1cec258c9a64ec9f43a8a6e.zip
cleanup
svn-id: r21572
-rw-r--r--base/gameDetector.cpp5
-rw-r--r--base/main.cpp8
2 files changed, 4 insertions, 9 deletions
diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp
index f4b8446798..eb6acab5de 100644
--- a/base/gameDetector.cpp
+++ b/base/gameDetector.cpp
@@ -576,11 +576,6 @@ void GameDetector::processSettings(Common::String &target, Common::StringMap &se
settings.erase("force-1x-overlay"); // This option should not be passed to ConfMan.
}
- // The following options shouldn't get into ConfMan, so we remove them
- settings.erase("config");
- settings.erase("debugflags");
- settings.erase("target");
-
// Finally, store the command line settings into the config manager.
for (Common::StringMap::const_iterator x = settings.begin(); x != settings.end(); ++x) {
diff --git a/base/main.cpp b/base/main.cpp
index 70adf7efd8..b2b6c7be80 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -333,6 +333,9 @@ extern "C" int scummvm_main(int argc, char *argv[]) {
ConfMan.loadDefaultConfigFile();
}
+ // Update the config file
+ ConfMan.set("versioninfo", gScummVMVersion, Common::ConfigManager::kApplicationDomain);
+
if (settings.contains("debuglevel")) {
gDebugLevel = (int)strtol(settings["debuglevel"].c_str(), 0, 10);
printf("Debuglevel (from command line): %d\n", gDebugLevel);
@@ -340,9 +343,6 @@ extern "C" int scummvm_main(int argc, char *argv[]) {
} else if (ConfMan.hasKey("debuglevel"))
gDebugLevel = ConfMan.getInt("debuglevel");
- // Update the config file
- ConfMan.set("versioninfo", gScummVMVersion, Common::ConfigManager::kApplicationDomain);
-
// Look for special debug flags
if (settings.contains("debugflags")) {
specialDebug = settings["debugflags"];
@@ -368,7 +368,7 @@ extern "C" int scummvm_main(int argc, char *argv[]) {
}
- // Process the command line settings
+ // Process the remaining command line settings
#ifndef _WIN32_WCE
GameDetector detector;
#endif