[Scummvm-cvs-logs] SF.net SVN: scummvm: [20858] scummvm/trunk/engines/scumm/he/wiz_he.cpp

kirben at users.sourceforge.net kirben at users.sourceforge.net
Fri Feb 24 17:03:12 CET 2006


Revision: 20858
Author:   kirben
Date:     2006-02-24 17:02:07 -0800 (Fri, 24 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20858&view=rev

Log Message:
-----------
Adjust masking in copyWizImageWithMask() to match ScummVM, wizImages masking works fine now

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 01:01:27 UTC (rev 20857)
+++ scummvm/trunk/engines/scumm/he/wiz_he.cpp	2006-02-25 01:02:07 UTC (rev 20858)
@@ -23,6 +23,8 @@
 
 #include "common/stdafx.h"
 
+#include "common/util.h"
+
 #include "scumm/he/intern_he.h"
 #include "scumm/resource.h"
 #include "scumm/scumm.h"
@@ -420,7 +422,7 @@
 	while (h--) {
 		xoff = srcRect.left;
 		w = srcRect.width();
-		mask = 1 << (7 - dstRect.left);
+		mask = (0x80 >> (dstRect.left & 7));
 		off = READ_LE_UINT16(dataPtr); dataPtr += 2;
 		dstPtrNext = dstPtr + dstw;
 		dataPtrNext = dataPtr + off;







More information about the Scummvm-git-logs mailing list