diff options
| author | athrxx | 2011-04-21 20:29:25 +0200 |
|---|---|---|
| committer | athrxx | 2011-04-21 20:29:25 +0200 |
| commit | 204644b001d85612742426b5731b8149b0a24f2e (patch) | |
| tree | 8e19872f056e773335536b5cb6a70d3e3f55f75f /engines/sci/engine/script.cpp | |
| parent | b0008d2d33c394fbba358c08b032c5872e6a909d (diff) | |
| parent | 44e79c70fa2908e0abdb7c9effa1dd039404a520 (diff) | |
| download | scummvm-rg350-204644b001d85612742426b5731b8149b0a24f2e.tar.gz scummvm-rg350-204644b001d85612742426b5731b8149b0a24f2e.tar.bz2 scummvm-rg350-204644b001d85612742426b5731b8149b0a24f2e.zip | |
Merge branch 'master' of https://github.com/scummvm/scummvm
Diffstat (limited to 'engines/sci/engine/script.cpp')
| -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)); } |