[Scummvm-cvs-logs] CVS: scummvm/simon debugger.cpp,1.11,1.12 simon.cpp,1.478,1.479

[Max Horn]

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

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

Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/debugger.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- debugger.cpp	29 Jan 2004 19:37:59 -0000	1.11
+++ debugger.cpp	25 Dec 2004 19:04:18 -0000	1.12
@@ -20,12 +20,11 @@
  */
 
 #include "stdafx.h"
+#include "common/config-manager.h"
 #include "common/debugger.cpp"
 #include "simon/debugger.h"
 #include "simon/simon.h"
 
-extern uint16 g_debugLevel;
-
 namespace Simon {
 
 Debugger::Debugger(SimonEngine *vm) 
@@ -88,10 +87,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 && level < 10) {
 			_vm->_debugMode = true;
 			DebugPrintf("Debug level set to level %d\n", level);

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -d -r1.478 -r1.479
--- simon.cpp	20 Dec 2004 16:45:17 -0000	1.478
+++ simon.cpp	25 Dec 2004 19:04:18 -0000	1.479
@@ -45,8 +45,6 @@
 #include "globals.h"
 #endif
 
-extern uint16 g_debugLevel;
-
 struct SimonGameSettings {
 	const char *name;
 	const char *description;
@@ -4004,13 +4002,13 @@
 	_continous_vgascript = false;
 	_draw_images_debug=false;
 
-	if (g_debugLevel == 2)
+	if (ConfMan.getInt("debuglevel") == 2)
 		_continous_mainscript = true;
-	if (g_debugLevel == 3)
+	if (ConfMan.getInt("debuglevel") == 3)
 		_continous_vgascript = true;
-	if (g_debugLevel == 4)
+	if (ConfMan.getInt("debuglevel") == 4)
 		_start_mainscript = true;
-	if (g_debugLevel == 5)
+	if (ConfMan.getInt("debuglevel") == 5)
 		_start_vgascript = true;
 
 	if (_game & GF_TALKIE) {