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

cleanup

Browse source 
svn-id: r21572
This commit is contained in:
Max Horn 2006-04-02 21:38:36 +00:00
parent 214c01d15d
commit 4df2948902
2 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
base/gameDetector.cpp
View file

@ -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. 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. // Finally, store the command line settings into the config manager.
for (Common::StringMap::const_iterator x = settings.begin(); x != settings.end(); ++x) { for (Common::StringMap::const_iterator x = settings.begin(); x != settings.end(); ++x) {

8
base/main.cpp
View file

@ -333,6 +333,9 @@ extern "C" int scummvm_main(int argc, char *argv[]) {
ConfMan.loadDefaultConfigFile(); ConfMan.loadDefaultConfigFile();
} }
// Update the config file
ConfMan.set("versioninfo", gScummVMVersion, Common::ConfigManager::kApplicationDomain);
if (settings.contains("debuglevel")) { if (settings.contains("debuglevel")) {
gDebugLevel = (int)strtol(settings["debuglevel"].c_str(), 0, 10); gDebugLevel = (int)strtol(settings["debuglevel"].c_str(), 0, 10);
printf("Debuglevel (from command line): %d\n", gDebugLevel); 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")) } else if (ConfMan.hasKey("debuglevel"))
gDebugLevel = ConfMan.getInt("debuglevel"); gDebugLevel = ConfMan.getInt("debuglevel");
// Update the config file
ConfMan.set("versioninfo", gScummVMVersion, Common::ConfigManager::kApplicationDomain);
// Look for special debug flags // Look for special debug flags
if (settings.contains("debugflags")) { if (settings.contains("debugflags")) {
specialDebug = settings["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 #ifndef _WIN32_WCE
GameDetector detector; GameDetector detector;
#endif #endif