diff options
| author | Willem Jan Palenstijn | 2011-04-20 23:37:53 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2011-04-20 23:38:28 +0200 |
| commit | eb8b1a962b26ffe9af003a2045aade36734240cb (patch) | |
| tree | ba0455846b7d5e54a8f08b2d9f976ff795da11eb /engines | |
| parent | 804f0f3e477a933ecb0cade7de9cbb35e30a51e4 (diff) | |
| download | scummvm-rg350-eb8b1a962b26ffe9af003a2045aade36734240cb.tar.gz scummvm-rg350-eb8b1a962b26ffe9af003a2045aade36734240cb.tar.bz2 scummvm-rg350-eb8b1a962b26ffe9af003a2045aade36734240cb.zip | |
SCI: Fix precedence (bug #3087872)
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/engine/script.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp index fb96518f19..25bf91c3ad 100644 --- a/engines/sci/engine/script.cpp +++ b/engines/sci/engine/script.cpp @@ -611,7 +611,7 @@ void Script::initialiseObjectsSci0(SegManager *segMan, SegmentId segmentId) { // #3150767. // Same happens with script 764, it seems to // contain junk towards its end. - _objects.erase(addr.toUint16() + (getSciVersion() < SCI_VERSION_1_1) ? 8 : 0); + _objects.erase(addr.toUint16() - SCRIPT_OBJECT_MAGIC_OFFSET); } else { error("Failed to locate base object for object at %04X:%04X", PRINT_REG(addr)); } |