[Scummvm-cvs-logs] SF.net SVN: scummvm: [20854] scummvm/trunk/engines/scumm/he/wiz_he.cpp
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Fri Feb 24 16:36:06 CET 2006
Revision: 20854
Author: kirben
Date: 2006-02-24 16:35:36 -0800 (Fri, 24 Feb 2006)
ViewCVS: http://svn.sourceforge.net/scummvm?rev=20854&view=rev
Log Message:
-----------
More corrections to copyWizImageWithMask() in HE games
Modified Paths:
--------------
scummvm/trunk/engines/scumm/he/wiz_he.cpp
Modified: scummvm/trunk/engines/scumm/he/wiz_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/wiz_he.cpp 2006-02-25 00:33:12 UTC (rev 20853)
+++ scummvm/trunk/engines/scumm/he/wiz_he.cpp 2006-02-25 00:35:36 UTC (rev 20854)
@@ -394,8 +394,8 @@
if (!calcClipRects(dstw, dsth, srcx, srcy, srcw, srch, rect, srcRect, dstRect)) {
return;
}
- dstw = (dstw & 7) / 8;
- dst += dstRect.top * dstw + ((dstRect.left & 7) / 8);
+ dstw = dstw / 8;
+ dst += dstRect.top * dstw + dstRect.left / 8;
const uint8 *dataPtr, *dataPtrNext;
uint8 *dstPtr, *dstPtrNext;
@@ -420,7 +420,7 @@
while (h--) {
xoff = srcRect.left;
w = srcRect.width();
- mask = 1 << (7 - (dstRect.left & 7));
+ mask = 1 << (7 - dstRect.left);
off = READ_LE_UINT16(dataPtr); dataPtr += 2;
dstPtrNext = dstPtr + dstw;
dataPtrNext = dataPtr + off;
@@ -430,7 +430,6 @@
databit = code & 1;
code >>= 1;
if (databit) {
- code >>= 1;
if (xoff > 0) {
xoff -= code;
if (xoff >= 0)
More information about the Scummvm-git-logs
mailing list