[Scummvm-git-logs] scummvm master -> d0040dc8ef18673126f63dbbf800fa4b73792604

[csnover]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d0040dc8ef SCI32: Fix SCI3 object names > 0xFFFF


Commit: d0040dc8ef18673126f63dbbf800fa4b73792604
    https://github.com/scummvm/scummvm/commit/d0040dc8ef18673126f63dbbf800fa4b73792604
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-05-25T19:25:50-05:00

Commit Message:
SCI32: Fix SCI3 object names > 0xFFFF

Changed paths:
    engines/sci/engine/object.cpp


diff --git a/engines/sci/engine/object.cpp b/engines/sci/engine/object.cpp
index b0e9939..5d85bf6 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
 	}