[Scummvm-cvs-logs] CVS: scummvm/sword1 screen.cpp,1.14,1.15

[Robert G?ffringmann]

Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1:/tmp/cvs-serv3141/sword1

Modified Files:
	screen.cpp 
Log Message:
sprites should now be rendered correctly.

Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/screen.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- screen.cpp	20 Dec 2003 13:43:40 -0000	1.14
+++ screen.cpp	20 Dec 2003 15:26:44 -0000	1.15
@@ -390,13 +390,9 @@
 void SwordScreen::verticalMask(uint16 x, uint16 y, uint16 bWidth, uint16 bHeight) {
 	if (_roomDefTable[_currentScreen].totalLayers <= 1)
 		return;
-	bWidth = (bWidth + (SCRNGRID_X - 1)) / SCRNGRID_X;
-	bHeight = (bHeight + (SCRNGRID_Y - 1)) / SCRNGRID_Y;
-	
-	if (x & (SCRNGRID_X - 1))
-		bWidth++;
-	if (y & (SCRNGRID_Y - 1))
-		bHeight++;
+
+	bWidth = (bWidth + (x & (SCRNGRID_X - 1)) + (SCRNGRID_X - 1)) / SCRNGRID_X;
+	bHeight = (bHeight + (y & (SCRNGRID_Y - 1)) + (SCRNGRID_Y - 1)) / SCRNGRID_Y;
 
 	x /= SCRNGRID_X;
 	y /= SCRNGRID_Y;