diff options
| -rw-r--r-- | engines/sci/console.cpp | 6 | ||||
| -rw-r--r-- | engines/sci/sci.cpp | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp index 4ab10d9eb9..8f977c04c2 100644 --- a/engines/sci/console.cpp +++ b/engines/sci/console.cpp @@ -201,12 +201,14 @@ Console::~Console() { } void Console::preEnter() { - _vm->_gamestate->_sound.sfx_suspend(true); + if (_vm->_gamestate) + _vm->_gamestate->_sound.sfx_suspend(true); _vm->_mixer->pauseAll(true); } void Console::postEnter() { - _vm->_gamestate->_sound.sfx_suspend(false); + if (_vm->_gamestate) + _vm->_gamestate->_sound.sfx_suspend(false); _vm->_mixer->pauseAll(false); } diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index 0826509a8b..fb5356ba64 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -89,6 +89,8 @@ SciEngine::SciEngine(OSystem *syst, const SciGameDescription *desc) Common::addDebugChannel(kDebugLevelScripts, "Scripts", "Notifies when scripts are unloaded"); Common::addDebugChannel(kDebugLevelGC, "GC", "Garbage Collector debugging"); + _gamestate = 0; + printf("SciEngine::SciEngine\n"); } @@ -251,11 +253,14 @@ Common::Error SciEngine::run() { // Invoked by error() when a severe error occurs GUI::Debugger *SciEngine::getDebugger() { - ExecStack *xs = &(_gamestate->_executionStack.back()); + if (_gamestate) { + ExecStack *xs = &(_gamestate->_executionStack.back()); + xs->addr.pc.offset = debugState.old_pc_offset; + xs->sp = debugState.old_sp; + } + debugState.runningStep = 0; // Stop multiple execution debugState.seeking = kDebugSeekNothing; // Stop special seeks - xs->addr.pc.offset = debugState.old_pc_offset; - xs->sp = debugState.old_sp; return _console; } |