[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.411,1.412

[Max Horn]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv2726/simon

Modified Files:
	simon.cpp 
Log Message:
renamed global var _debugLevel to g_debugLevel; let Engine constructor init it (this way all engines get it for free, allows further cleanup); removed some useless/duplicate member vars in SwordEngine

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -d -r1.411 -r1.412
--- simon.cpp	3 Jan 2004 01:28:00 -0000	1.411
+++ simon.cpp	4 Jan 2004 14:00:57 -0000	1.412
@@ -51,7 +51,7 @@
 extern bool draw_keyboard;
 #endif
 
-extern uint16 _debugLevel;
+extern uint16 g_debugLevel;
 
 struct SimonGameSettings {
 	const char *name;
@@ -344,7 +344,6 @@
 	_dx_use_3_or_4_for_lock = 0;
 
 	_debugMode = 0;
-	_debugLevel = 0;
 	_language = 0;
 	_pause = 0;
 	_start_mainscript = 0;
@@ -567,7 +566,6 @@
 	midi.set_volume(ConfMan.getInt("music_volume"));
 
 	_debugMode = ConfMan.hasKey("debuglevel");
-	_debugLevel = ConfMan.getInt("debuglevel");
 	_language = Common::parseLanguage(ConfMan.get("language"));
 
 	if (ConfMan.hasKey("music_mute") && ConfMan.getBool("music_mute") == 1)
@@ -4819,13 +4817,13 @@
 	_continous_vgascript = false;
 	_draw_images_debug=false;
 
-	if (_debugLevel == 2)
+	if (g_debugLevel == 2)
 		_continous_mainscript = true;
-	if (_debugLevel == 3)
+	if (g_debugLevel == 3)
 		_continous_vgascript = true;
-	if (_debugLevel == 4)
+	if (g_debugLevel == 4)
 		_start_mainscript = true;
-	if (_debugLevel == 5)
+	if (g_debugLevel == 5)
 		_start_vgascript = true;
 
 	if (_game & GF_TALKIE) {