[Scummvm-cvs-logs] SF.net SVN: scummvm: [21572] scummvm/trunk/base

[fingolfin at users.sourceforge.net]

Revision: 21572
Author:   fingolfin
Date:     2006-04-02 14:38:36 -0700 (Sun, 02 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21572&view=rev

Log Message:
-----------
cleanup

Modified Paths:
--------------
    scummvm/trunk/base/gameDetector.cpp
    scummvm/trunk/base/main.cpp
Modified: scummvm/trunk/base/gameDetector.cpp
===================================================================
--- scummvm/trunk/base/gameDetector.cpp	2006-04-02 21:32:23 UTC (rev 21571)
+++ scummvm/trunk/base/gameDetector.cpp	2006-04-02 21:38:36 UTC (rev 21572)
@@ -576,12 +576,7 @@
 		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) {
 		String key(x->_key);

Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp	2006-04-02 21:32:23 UTC (rev 21571)
+++ scummvm/trunk/base/main.cpp	2006-04-02 21:38:36 UTC (rev 21572)
@@ -333,6 +333,9 @@
 		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 @@
 	} 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 @@
 	}
 	
 
-	// Process the command line settings
+	// Process the remaining command line settings
 #ifndef _WIN32_WCE
 	GameDetector detector;
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.