[Scummvm-cvs-logs] CVS: scummvm/scumm debugger.cpp,1.135,1.136

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18924/scumm

Modified Files:
	debugger.cpp 
Log Message:
Get rid of g_debugLevel (this fixes bug #1091142)

Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.cpp,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- debugger.cpp	28 Nov 2004 02:04:13 -0000	1.135
+++ debugger.cpp	25 Dec 2004 19:04:18 -0000	1.136
@@ -20,6 +20,7 @@
  */
 #include "stdafx.h"
 
+#include "common/config-manager.h"
 #include "common/file.h"
 #include "common/str.h"
 #include "common/util.h"
@@ -35,8 +36,6 @@
 
 #include "common/debugger.cpp"
 
-extern uint16 g_debugLevel;
-
 namespace Scumm {
 
 void CDECL debugC(int channel, const char *s, ...) {
@@ -45,7 +44,7 @@
 
 	// FIXME: Still spew all debug at -d9, for crashes in startup etc.
 	//	  Add setting from commandline ( / abstract channel interface)
-	if (!(g_scumm->_debugFlags & channel) && (g_debugLevel < 9))
+	if (!(g_scumm->_debugFlags & channel) && (ConfMan.getInt("debuglevel") < 9))
 		return;
 
 	va_start(va, s);
@@ -593,10 +592,10 @@
 		if (_vm->_debugMode == false)
 			DebugPrintf("Debugging is not enabled at this time\n");
 		else
-			DebugPrintf("Debugging is currently set at level %d\n", g_debugLevel);
+			DebugPrintf("Debugging is currently set at level %d\n", ConfMan.getInt("debuglevel"));
 	} else { // set level
 		int level = atoi(argv[1]);
-		g_debugLevel = level;
+		ConfMan.set("debuglevel", level, Common::ConfigManager::kTransientDomain);
 		if (level > 0) {
 			_vm->_debugMode = true;
 			DebugPrintf("Debug level set to level %d\n", level);