diff options
| author | Filippos Karapetis | 2011-01-04 23:19:04 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2011-01-04 23:19:04 +0000 |
| commit | 2d5dc8c6382e52c22b2833488b9ea09b38a947e3 (patch) | |
| tree | 641b29335b492ea8564e9a9c4905af342d1fe039 | |
| parent | f2234f8ee369d701467e723a92ac15be3a1ae534 (diff) | |
| download | scummvm-rg350-2d5dc8c6382e52c22b2833488b9ea09b38a947e3.tar.gz scummvm-rg350-2d5dc8c6382e52c22b2833488b9ea09b38a947e3.tar.bz2 scummvm-rg350-2d5dc8c6382e52c22b2833488b9ea09b38a947e3.zip | |
SCI: Cleanup
svn-id: r55123
| -rw-r--r-- | engines/sci/engine/script.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp index b6b9fe81d4..6719b73aa5 100644 --- a/engines/sci/engine/script.cpp +++ b/engines/sci/engine/script.cpp @@ -595,10 +595,7 @@ void Script::initialiseObjectsSci0(SegManager *segMan, SegmentId segmentId) { // #3150767. // Same happens with script 764, it seems to // contain junk towards its end. - if (getSciVersion() < SCI_VERSION_1_1) - addr.offset += 8; - - _objects.erase(addr.toUint16()); + _objects.erase(addr.toUint16() + (getSciVersion() < SCI_VERSION_1_1) ? 8 : 0); } else { error("Failed to locate base object for object at %04X:%04X", PRINT_REG(addr)); } |