[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.584,1.585

[Eugene Sandulenko]

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

Modified Files:
	scumm.cpp 
Log Message:
Fix regression introduced when we split engine constructiors into
constructor itself and init() method. debug() and error() are dependent
on _debug object in many engines, so if these methods were called on early
stage, scummvm crashed.


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.584
retrieving revision 1.585
diff -u -d -r1.584 -r1.585
--- scumm.cpp	20 Sep 2005 00:52:32 -0000	1.584
+++ scumm.cpp	22 Sep 2005 22:55:01 -0000	1.585
@@ -826,6 +826,8 @@
 	  _platform(gs.platform),
 	  _substResFileNameIndex(substResFileNameIndex),
 	  _substResFileNameIndexBundle(0),
+	  _debugger(0),
+	  _currentScript(0xFF), // Let debug() work on init stage
 	  gdi(this),
 	  res(this),
 	  _pauseDialog(0), _mainMenuDialog(0), _versionDialog(0),
@@ -933,7 +935,6 @@
 	_musicEngine = NULL;
 	_verbs = NULL;
 	_objs = NULL;
-	_debugger = NULL;
 	_debugFlags = 0;
 	_sound = NULL;
 	memset(&vm, 0, sizeof(vm));
@@ -1009,7 +1010,6 @@
 	_scriptOrgPointer = NULL;
 	_opcode = 0;
 	vm.numNestedScripts = 0;
-	_currentScript = 0;
 	_curExecScript = 0;
 	_lastCodePtr = NULL;
 	_resultVarNumber = 0;