diff options
| -rw-r--r-- | scumm/script.cpp | 5 | ||||
| -rw-r--r-- | scumm/script_v6.cpp | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp index 2e929f368f..0c18a87831 100644 --- a/scumm/script.cpp +++ b/scumm/script.cpp @@ -840,8 +840,11 @@ void ScummEngine::killScriptsAndResources() { void ScummEngine::killAllScriptsExceptCurrent() { for (int i = 0; i < NUM_SCRIPT_SLOT; i++) { - if (i != _currentScript) + if (i != _currentScript) { vm.slot[i].status = ssDead; + if (_version == 6) + vm.slot[i].cutsceneOverride = 0; + } } } diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index ede4f88d20..f773547023 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -2599,7 +2599,7 @@ void ScummEngine_v6::o6_kernelSetFunctions() { } else { switch (args[0]) { case 3: - warning("o6_kernelSetFunctions: nothing in 3"); + // Dummy case break; case 4: grabCursor(args[1], args[2], args[3], args[4]); @@ -2618,7 +2618,7 @@ void ScummEngine_v6::o6_kernelSetFunctions() { startManiac(); break; case 9: - error("o6_kernelSetFunctions: stub9()"); + killAllScriptsExceptCurrent(); break; case 104: /* samnmax */ nukeFlObjects(args[2], args[3]); |