[Scummvm-cvs-logs] CVS: scummvm/scumm debugger.cpp,1.116,1.117 scummvm.cpp,2.542,2.543
James Brown
ender at users.sourceforge.net
Wed Jan 14 02:03:01 CET 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv25925/scumm
Modified Files:
debugger.cpp scummvm.cpp
Log Message:
Move SCUMM debugger init later on. With this _numVariables is set, so theoretically the Debugger's scumm_vars[] array should work again. Although it
doesn't, for some reason I have yet to look into.
Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- debugger.cpp 12 Jan 2004 18:51:15 -0000 1.116
+++ debugger.cpp 14 Jan 2004 10:02:33 -0000 1.117
@@ -70,7 +70,7 @@
DVar_Register("scumm_room", &_vm->_currentRoom, DVAR_INT, 0);
DVar_Register("scumm_roomresource", &_vm->_roomResource, DVAR_INT, 0);
DVar_Register("scumm_vars", &_vm->_scummVars, DVAR_INTARRAY, _vm->_numVariables);
-
+ printf("Registered debugger\n");
DVar_Register("scumm_gamename", &_vm->_targetName, DVAR_STRING, 0);
DVar_Register("scumm_exename", &_vm->_gameName, DVAR_STRING, 0);
DVar_Register("scumm_gameid", &_vm->_gameId, DVAR_INT, 0);
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.542
retrieving revision 2.543
diff -u -d -r2.542 -r2.543
--- scummvm.cpp 14 Jan 2004 01:41:44 -0000 2.542
+++ scummvm.cpp 14 Jan 2004 10:02:33 -0000 2.543
@@ -709,9 +709,6 @@
// Setup GDI object
gdi._numStrips = _screenWidth / 8;
- // Create debugger
- _debugger = new ScummDebugger(this);
-
_sound = new Sound(this);
#ifndef __GP32__ //ph0x FIXME, "quick dirty hack"
@@ -981,6 +978,11 @@
}
_sound->setupSound();
+ // Create debugger
+ if (!_debugger)
+ _debugger = new ScummDebugger(this);
+
+
// If requested, load a save game instead of running the boot script
if (_saveLoadFlag != 2 || !loadState(_saveLoadSlot, _saveLoadCompatible)) {
if (_gameId == GID_MANIAC && _version == 1 && _demoMode)
More information about the Scummvm-git-logs
mailing list