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

[fingolfin at users.sourceforge.net]

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

Log Message:
-----------
Set gDebugLevel in a single unified spot, instead of two different places

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:28:01 UTC (rev 21570)
+++ scummvm/trunk/base/gameDetector.cpp	2006-04-02 21:32:23 UTC (rev 21571)
@@ -566,12 +566,6 @@
 #endif
 
 
-	if (settings.contains("debuglevel")) {
-		gDebugLevel = (int)strtol(settings["debuglevel"].c_str(), 0, 10);
-		printf("Debuglevel (from command line): %d\n", gDebugLevel);
-		settings.erase("debuglevel");	// This option should not be passed to ConfMan.
-	}
-
 	if (settings.contains("dump-scripts")) {
 		_dumpScripts = (settings["dump-scripts"] == "true");
 		settings.erase("dump-scripts");	// This option should not be passed to ConfMan.

Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp	2006-04-02 21:28:01 UTC (rev 21570)
+++ scummvm/trunk/base/main.cpp	2006-04-02 21:32:23 UTC (rev 21571)
@@ -333,7 +333,11 @@
 		ConfMan.loadDefaultConfigFile();
 	}
 
-	if (ConfMan.hasKey("debuglevel"))
+	if (settings.contains("debuglevel")) {
+		gDebugLevel = (int)strtol(settings["debuglevel"].c_str(), 0, 10);
+		printf("Debuglevel (from command line): %d\n", gDebugLevel);
+		settings.erase("debuglevel");	// This option should not be passed to ConfMan.
+	} else if (ConfMan.hasKey("debuglevel"))
 		gDebugLevel = ConfMan.getInt("debuglevel");
 
 	// Update the config file


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