aboutsummaryrefslogtreecommitdiff
path: root/scumm/object.cpp
diff options
context:
space:
mode:
authorMax Horn2003-04-28 18:28:43 +0000
committerMax Horn2003-04-28 18:28:43 +0000
commitc9f80db201bcecbd7a2464cae92755550b0c6f48 (patch)
tree39420543a6333ebe538f476f76b979d3a0c9013c /scumm/object.cpp
parent850ee739afcb2a15d016d78b782fd073bf5b75ca (diff)
downloadscummvm-rg350-c9f80db201bcecbd7a2464cae92755550b0c6f48.tar.gz
scummvm-rg350-c9f80db201bcecbd7a2464cae92755550b0c6f48.tar.bz2
scummvm-rg350-c9f80db201bcecbd7a2464cae92755550b0c6f48.zip
ooops, seems the 1 -> 16 changed caused a regression in Zak256 (and I bet in Indy3VGA, too). Reverting this change partially. If anybody experiences problem selecting certain objects in other GF_SMALL_HEADER, tell me
svn-id: r7186
Diffstat (limited to 'scumm/object.cpp')
-rw-r--r--scumm/object.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp
index e1aa5f0976..71b88c309b 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -638,6 +638,8 @@ void Scumm::setupRoomObject(ObjectData *od, byte *room, byte *searchptr) {
od->y_pos = ((*(ptr + 10)) & 0x7F) << 3;
od->parentstate = (*(ptr + 10) & 0x80) ? 16 : 0;
+ if (_features & GF_OLD256 && od->parentstate)
+ od->parentstate = 1;
od->width = *(ptr + 11) << 3;