diff options
| author | Colin Snover | 2017-05-24 22:40:45 -0500 |
|---|---|---|
| committer | Colin Snover | 2017-05-25 19:25:50 -0500 |
| commit | d0040dc8ef18673126f63dbbf800fa4b73792604 (patch) | |
| tree | 6152a2e62f139dcc091cc893c5935a49d5c35015 /engines | |
| parent | ad1cc613eff489e1efaecc5b78f99a33b3054688 (diff) | |
| download | scummvm-rg350-d0040dc8ef18673126f63dbbf800fa4b73792604.tar.gz scummvm-rg350-d0040dc8ef18673126f63dbbf800fa4b73792604.tar.bz2 scummvm-rg350-d0040dc8ef18673126f63dbbf800fa4b73792604.zip | |
SCI32: Fix SCI3 object names > 0xFFFF
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/engine/object.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/sci/engine/object.cpp b/engines/sci/engine/object.cpp index b0e9939348..5d85bf6b8d 100644 --- a/engines/sci/engine/object.cpp +++ b/engines/sci/engine/object.cpp @@ -106,7 +106,8 @@ void Object::init(const Script &owner, reg_t obj_pos, bool initVariables) { const uint32 nameOffset = _propertyOffsetsSci3[0]; const uint32 relocOffset = owner.getRelocationOffset(nameOffset); if (relocOffset != kNoRelocation) { - _name = make_reg(obj_pos.getSegment(), relocOffset + buf.getUint16SEAt(nameOffset)); + _name.setSegment(obj_pos.getSegment()); + _name.setOffset(relocOffset + buf.getUint16SEAt(nameOffset)); } #endif } |