libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-03 00:35:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prevent a crash when the engine errors out before the game state is initialized

Browse Source 
svn-id: r42201
This commit is contained in:
Filippos Karapetis 2009-07-07 06:53:53 +00:00
parent 0a8cd4a27d
commit 2e3419c8cb
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/sci/console.cpp
View File

@ -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);
}

11
engines/sci/sci.cpp
View File

@ -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;
}