diff options
| author | Max Horn | 2003-04-12 18:43:23 +0000 |
|---|---|---|
| committer | Max Horn | 2003-04-12 18:43:23 +0000 |
| commit | fc08a317b0a9a8e74644674f5fc5248d6dd6efe7 (patch) | |
| tree | 02a8db862c55538cc6a1ff17bad0150adaed11b5 | |
| parent | 32c7c4eb6bfdb9c8103b735c60700c58fcc1981a (diff) | |
| download | scummvm-rg350-fc08a317b0a9a8e74644674f5fc5248d6dd6efe7.tar.gz scummvm-rg350-fc08a317b0a9a8e74644674f5fc5248d6dd6efe7.tar.bz2 scummvm-rg350-fc08a317b0a9a8e74644674f5fc5248d6dd6efe7.zip | |
fixed OLD_BUNDLE object image offset
svn-id: r6991
| -rw-r--r-- | scumm/gfx.cpp | 2 | ||||
| -rw-r--r-- | scumm/object.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index a399e3b39f..7496b46690 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -952,7 +952,7 @@ void Gdi::drawBitmap(byte *ptr, VirtScreen *vs, int x, int y, const int h, } else { useOrDecompress = decompressBitmap(bgbak_ptr, smap_ptr + READ_LE_UINT32(smap_ptr + stripnr * 4 + 4), h); } - } else { + } else { useOrDecompress = decompressBitmap(bgbak_ptr, smap_ptr + READ_LE_UINT32(smap_ptr + stripnr * 4 + 8), h); } diff --git a/scumm/object.cpp b/scumm/object.cpp index a36e35d09a..f5dbb7ac0f 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -354,7 +354,9 @@ void Scumm::drawObject(int obj, int arg) { ptr = ptr + od->OBIMoffset; } - if (_features & GF_SMALL_HEADER) + if (_features & GF_OLD_BUNDLE) + ptr += 0; + else if (_features & GF_SMALL_HEADER) ptr += 8; else if (_features & GF_AFTER_V8) { ptr = findResource(MKID('IMAG'), ptr); |