aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2003-05-21 21:41:27 +0000
committerMax Horn2003-05-21 21:41:27 +0000
commit85e92f4fae6393b62824496edbcb7ddfee639246 (patch)
treea31ca63c5379b5157add5da8147ce81fdf717ae1
parent2612a8f8170bb38e86e44b6ec67d1e064bc53dea (diff)
downloadscummvm-rg350-85e92f4fae6393b62824496edbcb7ddfee639246.tar.gz
scummvm-rg350-85e92f4fae6393b62824496edbcb7ddfee639246.tar.bz2
scummvm-rg350-85e92f4fae6393b62824496edbcb7ddfee639246.zip
cutscene override fix for V3 games (bug #731985)
svn-id: r7809
-rw-r--r--scumm/script.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp
index 017a0e1fe9..54e044710b 100644
--- a/scumm/script.cpp
+++ b/scumm/script.cpp
@@ -1104,6 +1104,7 @@ void Scumm::beginOverride() {
fetchScriptByte();
fetchScriptWord();
+ // FIXME: why is this here? it doesn't seem to belong here?
VAR(VAR_OVERRIDE) = 0;
}
@@ -1115,5 +1116,7 @@ void Scumm::endOverride() {
vm.cutScenePtr[idx] = 0;
vm.cutSceneScript[idx] = 0;
- VAR(VAR_OVERRIDE) = 0;
+
+ if (!(_features & GF_AFTER_V3))
+ VAR(VAR_OVERRIDE) = 0;
}