diff options
| author | Travis Howell | 2006-03-15 06:29:28 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-03-15 06:29:28 +0000 |
| commit | 34b89a3258cd73087ad5b0a41ba82e7171094fd1 (patch) | |
| tree | f158c3ca174a82fb730b4ca918112146d247f2d1 | |
| parent | cc8796248da47d9bb964efddabaca0491ace5122 (diff) | |
| download | scummvm-rg350-34b89a3258cd73087ad5b0a41ba82e7171094fd1.tar.gz scummvm-rg350-34b89a3258cd73087ad5b0a41ba82e7171094fd1.tar.bz2 scummvm-rg350-34b89a3258cd73087ad5b0a41ba82e7171094fd1.zip | |
Correct VAR_OVERRIDE settings in override opcodes
svn-id: r21307
| -rw-r--r-- | engines/scumm/script.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp index dc91d624cc..02bf17cbbb 100644 --- a/engines/scumm/script.cpp +++ b/engines/scumm/script.cpp @@ -1365,8 +1365,8 @@ void ScummEngine::beginOverride() { fetchScriptByte(); fetchScriptWord(); - // This is based on disassembly - VAR(VAR_OVERRIDE) = 0; + if (_game.version >= 5) + VAR(VAR_OVERRIDE) = 0; } void ScummEngine::endOverride() { @@ -1376,7 +1376,7 @@ void ScummEngine::endOverride() { vm.cutScenePtr[idx] = 0; vm.cutSceneScript[idx] = 0; - if (_game.version > 3) + if (_game.version >= 4) VAR(VAR_OVERRIDE) = 0; } |