aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorTravis Howell2009-02-17 09:41:21 +0000
committerTravis Howell2009-02-17 09:41:21 +0000
commit241d99558666c57b6a9e3bc4d6809c22122dc49e (patch)
tree132968c34cf8dd6100be7e68c61a95b3ef54d4d2 /engines
parent0443c5fe9e086cab0c5cd4a56ca2af68457ddb1f (diff)
downloadscummvm-rg350-241d99558666c57b6a9e3bc4d6809c22122dc49e.tar.gz
scummvm-rg350-241d99558666c57b6a9e3bc4d6809c22122dc49e.tar.bz2
scummvm-rg350-241d99558666c57b6a9e3bc4d6809c22122dc49e.zip
Clear cutsceneOverride for all scripts (except current), when restarting any game, fixes bugs:
#1923193 - MONKEY: cannot restart during the intro #2518226 - FT demo: debugger at end of demo svn-id: r38398
Diffstat (limited to 'engines')
-rw-r--r--engines/scumm/script.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index a58f22b70d..856149d102 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -1047,8 +1047,7 @@ void ScummEngine::killAllScriptsExceptCurrent() {
for (int i = 0; i < NUM_SCRIPT_SLOT; i++) {
if (i != _currentScript) {
vm.slot[i].status = ssDead;
- if (_game.version == 6)
- vm.slot[i].cutsceneOverride = 0;
+ vm.slot[i].cutsceneOverride = 0;
}
}
}