From 8fddaada1dd6dad2302eb153892257d2020883fc Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 23 Apr 2005 13:52:27 +0000
Subject: Simplified debuglevel handling:  - it's only honored in the global
 level of the config file  - all checks for it go through gDebugLevel now,
 which is made global  - the '-d' switch is handled in a slightly saner and
 consistent way  - removed 'debuglevel' from the config format documentation;
 we do    not want to encourage the avarage user to use it

svn-id: r17769
---
 base/gameDetector.cpp | 11 ++---------
 base/main.cpp         |  3 ++-
 2 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'base')

diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp
index 3d292ff46d..c430f4a4ac 100644
--- a/base/gameDetector.cpp
+++ b/base/gameDetector.cpp
@@ -170,7 +170,6 @@ GameDetector::GameDetector() {
 #endif
 
 	// Miscellaneous
-	ConfMan.registerDefault("debuglevel", 0);
 	ConfMan.registerDefault("joystick_num", -1);
 	ConfMan.registerDefault("confirm_exit", false);
 #ifdef USE_ALSA
@@ -369,13 +368,8 @@ void GameDetector::parseCommandLine(int argc, char **argv) {
 			END_OPTION
 			
 			DO_OPTION_OPT('d', "debuglevel")
-				if (option != NULL)
-					ConfMan.set("debuglevel", (int)strtol(option, 0, 10), kTransientDomain);
-				gDebugLevel = ConfMan.getInt("debuglevel");
-				if (gDebugLevel)
-					printf("Debuglevel (from command line): %d\n", gDebugLevel);
-				else
-					printf("Debuglevel (from command line): 0 - Game only\n");
+				gDebugLevel = option ? (int)strtol(option, 0, 10) : 1;
+				printf("Debuglevel (from command line): %d\n", gDebugLevel);
 			END_OPTION
 			
 			DO_OPTION('e', "music-driver")
@@ -568,7 +562,6 @@ ShowHelpAndExit:
 void GameDetector::setTarget(const String &name) {
 	_targetName = name;
 	ConfMan.setActiveDomain(name);
-	gDebugLevel = ConfMan.getInt("debuglevel");
 }
 
 bool GameDetector::detectGame() {
diff --git a/base/main.cpp b/base/main.cpp
index 1b9e9495ee..d8afe0ddf7 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -360,7 +360,8 @@ extern "C" int main(int argc, char *argv[]) {
 	else
 		ConfMan.loadDefaultConfigFile();
 
-	gDebugLevel = ConfMan.getInt("debuglevel");
+	if (ConfMan.hasKey("debuglevel"))
+		gDebugLevel = ConfMan.getInt("debuglevel");
 
 	// Update the config file
 	ConfMan.set("versioninfo", gScummVMVersion, Common::ConfigManager::kApplicationDomain);
-- 
cgit v1.2.3