[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.300,2.301

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4254

Modified Files:
	gfx.cpp 
Log Message:
Fixed bug in DrawBMAPObject.


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.300
retrieving revision 2.301
diff -u -d -r2.300 -r2.301
--- gfx.cpp	5 Sep 2004 17:39:51 -0000	2.300
+++ gfx.cpp	6 Sep 2004 10:52:52 -0000	2.301
@@ -1364,14 +1364,15 @@
 		copyWizImage(dst, ptr, vs->w, vs->h, x - scrX, y, w, h, &rScreen);
 	}
 
-	Common::Rect rect1(x, y, w, h);
+	Common::Rect rect1(x, y, x + w, y + h);
 	Common::Rect rect2(scrX, 0, vs->w + scrX, vs->h);
 
-	if (rect1.intersects(rect2) && rect1.top <= rect1.bottom && rect1.left <= rect1.right) {
+	if (rect1.intersects(rect2)) {
 		rect1.left -= rect2.left;
 		rect1.right -= rect2.left;
 		rect1.top -= rect2.top;
 		rect1.bottom -= rect2.top;
+
 		copyVirtScreenBuffers(rect1);
 	}
 }