[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.455,2.456

[kirben]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32514/scumm

Modified Files:
	gfx.cpp 
Log Message:

Correct tmsk offset.


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.455
retrieving revision 2.456
diff -u -d -r2.455 -r2.456
--- gfx.cpp	21 May 2005 14:14:03 -0000	2.455
+++ gfx.cpp	21 May 2005 15:04:50 -0000	2.456
@@ -1388,7 +1388,7 @@
 	
 	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 @@
 					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);