aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2005-05-21 15:04:50 +0000
committerTravis Howell2005-05-21 15:04:50 +0000
commit30408308bc1ec8abd194c8913d3ad07dcba8559f (patch)
treea2e0cb0386b50cba8178751dd9a3e3c995584e48
parent59ea8df4e466a71645da1a34e5199f9f293c194b (diff)
downloadscummvm-rg350-30408308bc1ec8abd194c8913d3ad07dcba8559f.tar.gz
scummvm-rg350-30408308bc1ec8abd194c8913d3ad07dcba8559f.tar.bz2
scummvm-rg350-30408308bc1ec8abd194c8913d3ad07dcba8559f.zip
Correct tmsk offset.
svn-id: r18210
-rw-r--r--scumm/gfx.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index b0f82ecafa..7902031879 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -1388,7 +1388,7 @@ void Gdi::drawBitmap(const byte *ptr, VirtScreen *vs, int x, int y, const int wi
const byte *tmsk_ptr = NULL;
if (_vm->_heversion >= 72) {
- tmsk_ptr = _vm->findResourceData(MKID('TMSK'), ptr);
+ tmsk_ptr = _vm->findResource(MKID('TMSK'), ptr);
}
bottom = y + height;
@@ -1557,7 +1557,7 @@ void Gdi::drawBitmap(const byte *ptr, VirtScreen *vs, int x, int y, const int wi
z_plane_ptr = zplane_list[i] + offs;
if (tmsk_ptr) {
- const byte *tmsk = tmsk_ptr + stripnr * 2 + 8;
+ const byte *tmsk = tmsk_ptr + READ_LE_UINT16(tmsk_ptr + 8);
decompressTMSK(mask_ptr, tmsk, z_plane_ptr, height);
} else if (useOrDecompress && (flag & dbAllowMaskOr)) {
decompressMaskImgOr(mask_ptr, z_plane_ptr, height);