[Scummvm-cvs-logs] SF.net SVN: scummvm: [31524] scummvm/trunk/engines/kyra/screen.cpp

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Thu Apr 17 01:11:46 CEST 2008


Revision: 31524
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31524&view=rev
Author:   lordhoto
Date:     2008-04-16 16:11:46 -0700 (Wed, 16 Apr 2008)

Log Message:
-----------
Fixed mask page handling in ScreenEx::copyWsaRect, this time it should be correct...

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/screen.cpp

Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp	2008-04-16 23:09:07 UTC (rev 31523)
+++ scummvm/trunk/engines/kyra/screen.cpp	2008-04-16 23:11:46 UTC (rev 31524)
@@ -3246,7 +3246,7 @@
 			while (cW--) {
 				uint8 d = *src++;
 				uint8 t = _shapePages[0][dst - origDst] & 7;
-				if (unk1 < t || curY <= _maskMinY || curY >= _maskMaxY)
+				if (unk1 < t && (curY > _maskMinY && curY < _maskMaxY))
 					d = _shapePages[1][dst - origDst];
 				*dst++ = d;
 			}
@@ -3258,7 +3258,7 @@
 				uint8 d = *src++;
 				if (d) {
 					uint8 t = _shapePages[0][dst - origDst] & 7;
-					if (unk1 < t || curY <= _maskMinY || curY >= _maskMaxY)
+					if (unk1 < t && (curY > _maskMinY && curY < _maskMaxY))
 						d = _shapePages[1][dst - origDst];
 					*dst++ = d;
 				} else {


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




More information about the Scummvm-git-logs mailing list