[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.330,2.331

Max Horn fingolfin at users.sourceforge.net
Sat Sep 25 10:54:55 CEST 2004


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

Modified Files:
	gfx.cpp 
Log Message:
cleanup

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.330
retrieving revision 2.331
diff -u -d -r2.330 -r2.331
--- gfx.cpp	25 Sep 2004 17:46:23 -0000	2.330
+++ gfx.cpp	25 Sep 2004 17:50:42 -0000	2.331
@@ -1393,7 +1393,7 @@
 
 		drawStripHE((byte *)vs->backBuf, width, bmap_ptr, vs->w, vs->h, false);
 	}
-	copyVirtScreenBuffers(Common::Rect(0, 0, vs->w - 1, vs->h - 1));
+	copyVirtScreenBuffers(Common::Rect(vs->w, vs->h));
 
 	if (_numZBuffer <= 1)
 		return;
@@ -1447,6 +1447,11 @@
 		rect1.right -= rect2.left;
 		rect1.top -= rect2.top;
 		rect1.bottom -= rect2.top;
+		
+		// FIXME: The following two duplicate the old behaviour of this code
+		// but I am not sure that this was right to start with... ?
+		rect1.right++;
+		rect1.bottom++;
 
 		copyVirtScreenBuffers(rect1);
 	}
@@ -1723,8 +1728,8 @@
 }
 
 void Gdi::copyVirtScreenBuffers(const Common::Rect &rect) {
-	int rw = rect.right - rect.left + 1;
-	int rh = rect.bottom - rect.top + 1;
+	int rw = rect.right - rect.left;
+	int rh = rect.bottom - rect.top;
 	byte *src, *dst;
 	
 	src = _vm->virtscr[0].getBackPixels(rect.left, rect.top);





More information about the Scummvm-git-logs mailing list