[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.117,1.118 costume.cpp,1.127,1.128

Max Horn fingolfin at users.sourceforge.net
Sun Apr 4 12:54:04 CEST 2004


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

Modified Files:
	akos.cpp costume.cpp 
Log Message:
My recent change to _draw_bottom caused a regression in The Dig (and maybe elsewhere). Ah well, probably better to draw one line more than one line less anyway

Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- akos.cpp	4 Apr 2004 01:11:27 -0000	1.117
+++ akos.cpp	4 Apr 2004 19:41:02 -0000	1.118
@@ -732,8 +732,8 @@
 
 	if (_draw_top > rect.top)
 		_draw_top = rect.top;
-	if (_draw_bottom < rect.bottom - 1)
-		_draw_bottom = rect.bottom - 1;
+	if (_draw_bottom < rect.bottom)
+		_draw_bottom = rect.bottom;
 
 	v1.destptr = _outptr + v1.y * _outwidth + v1.x;
 
@@ -776,8 +776,8 @@
 
 	if (_draw_top > clip.top)
 		_draw_top = clip.top;
-	if (_draw_bottom < clip.bottom - 1)
-		_draw_bottom = clip.bottom - 1;
+	if (_draw_bottom < clip.bottom)
+		_draw_bottom = clip.bottom;
 
 	BompDrawData bdd;
 

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- costume.cpp	3 Apr 2004 20:56:19 -0000	1.127
+++ costume.cpp	4 Apr 2004 19:41:02 -0000	1.128
@@ -262,8 +262,8 @@
 
 	if (_draw_top > rect.top)
 		_draw_top = rect.top;
-	if (_draw_bottom < rect.bottom - 1)
-		_draw_bottom = rect.bottom - 1;
+	if (_draw_bottom < rect.bottom)
+		_draw_bottom = rect.bottom;
 
 	if (_height + rect.top >= 256) {
 		CHECK_HEAP





More information about the Scummvm-git-logs mailing list