[Scummvm-cvs-logs] SF.net SVN: scummvm:[41157] scummvm/branches/gsoc2009-16bit/engines/scumm/ he/wiz_he.cpp

[Kirben at users.sourceforge.net]

Revision: 41157
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41157&view=rev
Author:   Kirben
Date:     2009-06-04 09:30:12 +0000 (Thu, 04 Jun 2009)

Log Message:
-----------
Fix regression in copyWizImageWithMask, which caused corruption in readtime.

Modified Paths:
--------------
    scummvm/branches/gsoc2009-16bit/engines/scumm/he/wiz_he.cpp

Modified: scummvm/branches/gsoc2009-16bit/engines/scumm/he/wiz_he.cpp
===================================================================
--- scummvm/branches/gsoc2009-16bit/engines/scumm/he/wiz_he.cpp	2009-06-04 08:30:31 UTC (rev 41156)
+++ scummvm/branches/gsoc2009-16bit/engines/scumm/he/wiz_he.cpp	2009-06-04 09:30:12 UTC (rev 41157)
@@ -450,7 +450,7 @@
 	if (!calcClipRects(dstw, dsth, srcx, srcy, srcw, srch, rect, srcRect, dstRect)) {
 		return;
 	}
-	dstw = dstw / 8;
+	dstPitch /= 8;
 	dst += dstRect.top * dstPitch + dstRect.left / 8;
 
 	const uint8 *dataPtr, *dataPtrNext;
@@ -1447,9 +1447,11 @@
 	case 1:
 		if (flags & 0x80) {
 			dst = _vm->getMaskBuffer(0, 0, 1);
+			dstPitch = _vm->_bitDepth;
 			copyWizImageWithMask(dst, wizd, dstPitch, cw, ch, x1, y1, width, height, &rScreen, 0, 2);
 		} else if (flags & 0x100) {
 			dst = _vm->getMaskBuffer(0, 0, 1);
+			dstPitch /= _vm->_bitDepth;
 			copyWizImageWithMask(dst, wizd, dstPitch, cw, ch, x1, y1, width, height, &rScreen, 0, 1);
 		} else {
 			copyWizImage(dst, wizd, dstPitch, dstType, cw, ch, x1, y1, width, height, &rScreen, flags, palPtr, xmapPtr, _vm->_bitDepth);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.