aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2004-02-16 03:53:03 +0000
committerTravis Howell2004-02-16 03:53:03 +0000
commit42dd31d9f37ccd8822b9930ec7d460349bc04109 (patch)
treea13fa4246716d9ecd69293b9a26e268e05e14e32 /scumm
parentaf305a31c3f678c554862f271bc5455021964761 (diff)
downloadscummvm-rg350-42dd31d9f37ccd8822b9930ec7d460349bc04109.tar.gz
scummvm-rg350-42dd31d9f37ccd8822b9930ec7d460349bc04109.tar.bz2
scummvm-rg350-42dd31d9f37ccd8822b9930ec7d460349bc04109.zip
Add comment and case
svn-id: r12912
Diffstat (limited to 'scumm')
-rw-r--r--scumm/script.cpp5
-rw-r--r--scumm/script_v6.cpp4
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]);