libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-13 15:40:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

When loading or restarting, stop script processing if the game is being loaded or is restarting and the stack position has changed (it's always changed when loading) - fixes the case where the VM is trying to parse an invalid script

Browse Source 
svn-id: r50121
This commit is contained in:
Filippos Karapetis 2010-06-21 20:17:59 +00:00
parent 38b172e8e5
commit 97dd94019c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engines/sci/engine/vm.cpp
View File

@ -773,6 +773,9 @@ void run_vm(EngineState *s, bool restoring) {
g_debugState.old_pc_offset = s->xs->addr.pc.offset;
g_debugState.old_sp = s->xs->sp;
if (s->abortScriptProcessing != kAbortNone || g_engine->shouldQuit())
return; // Stop processing
if (s->_executionStackPosChanged) {
Script *scr;
s->xs = &(s->_executionStack.back());
@ -829,7 +832,7 @@ void run_vm(EngineState *s, bool restoring) {
}
if (s->abortScriptProcessing != kAbortNone || g_engine->shouldQuit())
return; // Emergency
return; // Stop processing
// Debug if this has been requested:
// TODO: re-implement sci_debug_flags