diff options
| author | Max Horn | 2003-05-01 16:05:47 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-01 16:05:47 +0000 |
| commit | 5095cd3860bd4107f9cf9c8f655fa6187c6e67c7 (patch) | |
| tree | 66333bc0ea339e24372c9542f9a16105936c168a /scumm/object.cpp | |
| parent | 99254eedc8899556dfd2cfbe7381093164d1e303 (diff) | |
| download | scummvm-rg350-5095cd3860bd4107f9cf9c8f655fa6187c6e67c7.tar.gz scummvm-rg350-5095cd3860bd4107f9cf9c8f655fa6187c6e67c7.tar.bz2 scummvm-rg350-5095cd3860bd4107f9cf9c8f655fa6187c6e67c7.zip | |
fixed regression in MonkeyVGA <sigh>. Aquadran, is the 16 right even for GF_OLD_BUNDLE ? Or should it just always be 1?
svn-id: r7252
Diffstat (limited to 'scumm/object.cpp')
| -rw-r--r-- | scumm/object.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp index 71b88c309b..243b41f53f 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -637,9 +637,9 @@ void Scumm::setupRoomObject(ObjectData *od, byte *room, byte *searchptr) { od->x_pos = *(ptr + 9) << 3; od->y_pos = ((*(ptr + 10)) & 0x7F) << 3; - od->parentstate = (*(ptr + 10) & 0x80) ? 16 : 0; - if (_features & GF_OLD256 && od->parentstate) - od->parentstate = 1; + od->parentstate = (*(ptr + 10) & 0x80) ? 1 : 0; + if (_features & GF_OLD_BUNDLE) + od->parentstate <<= 4; od->width = *(ptr + 11) << 3; |