diff options
author | James Brown | 2003-06-02 05:38:45 +0000 |
---|---|---|
committer | James Brown | 2003-06-02 05:38:45 +0000 |
commit | 9be08a55f9e54f8cf7e49f2a202a8c373a113d3a (patch) | |
tree | 96a26aed4e10c4fb54094473470d406a80004f80 /scumm/script.cpp | |
parent | ee886a6be29f1f9a6fca13c11b8b53b92b69c882 (diff) | |
download | scummvm-rg350-9be08a55f9e54f8cf7e49f2a202a8c373a113d3a.tar.gz scummvm-rg350-9be08a55f9e54f8cf7e49f2a202a8c373a113d3a.tar.bz2 scummvm-rg350-9be08a55f9e54f8cf7e49f2a202a8c373a113d3a.zip |
Clean up debugger Restart function and move to SCUMM restart function
svn-id: r8263
Diffstat (limited to 'scumm/script.cpp')
-rw-r--r-- | scumm/script.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp index 17b2a1b30c..0661494f0e 100644 --- a/scumm/script.cpp +++ b/scumm/script.cpp @@ -789,13 +789,17 @@ void Scumm::killScriptsAndResources() { ss = vm.slot; for (i = 0; i < NUM_SCRIPT_SLOT; i++, ss++) { if (ss->where == WIO_ROOM || ss->where == WIO_FLOBJECT) { - if (ss->cutsceneOverride != 0) - error("Object %d stopped with active cutscene/override in exit", ss->number); + if (ss->cutsceneOverride != 0) { + warning("Object %d stopped with active cutscene/override in exit", ss->number); + ss->cutsceneOverride = 0; + } ss->status = ssDead; } else if (ss->where == WIO_LOCAL) { // HACK to make Indy3 Demo work - if (ss->cutsceneOverride != 0 && !(_gameId == GID_INDY3 && _roomResource == 3)) - error("Script %d stopped with active cutscene/override in exit", ss->number); + if (ss->cutsceneOverride != 0 && !(_gameId == GID_INDY3 && _roomResource == 3)) { + warning("Script %d stopped with active cutscene/override in exit", ss->number); + ss->cutsceneOverride = 0; + } ss->status = ssDead; } } |