[Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.50,1.51 akos.cpp,1.66,1.67

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv14254

Modified Files:
	costume.cpp akos.cpp 
Log Message:
fix The Dig 'hang' regression

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- costume.cpp	29 May 2003 18:45:58 -0000	1.50
+++ costume.cpp	30 May 2003 00:41:58 -0000	1.51
@@ -185,7 +185,7 @@
 		return 0;
 
 	if (x_left >= _vm->_screenWidth || x_right <= 0)
-		return 1;
+		return 0;
 
 	v1.replen = 0;
 
@@ -242,7 +242,7 @@
 		return 2;
 	}
 
-	v1.destptr = _outptr + v1.y * _vm->_screenWidth + v1.x;
+	v1.destptr = _outptr + v1.y * _outwidth + v1.x;
 
 	v1.mask_ptr = _vm->getResourceAddress(rtBuffer, 9) + v1.y * _numStrips + _vm->_screenStartStrip;
 	v1.imgbufoffs = _vm->gdi._imgBufOffs[_zbuf];

Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- akos.cpp	29 May 2003 18:45:58 -0000	1.66
+++ akos.cpp	30 May 2003 00:41:58 -0000	1.67
@@ -641,11 +641,13 @@
 	v1.skip_width = _width;
 	v1.scaleXstep = _mirror ? 1 : -1;
 
+	_vm->updateDirtyRect(0, x_left, x_right, y_top, y_bottom, _dirty_id);
+
 	if (y_top >= (int)_outheight || y_bottom <= 0)
 		return 0;
 
 	if (x_left >= (int)_outwidth || x_right <= 0)
-		return 1;
+		return 0;
 
 	v1.replen = 0;
 
@@ -686,8 +688,6 @@
 
 	if (v1.skip_width <= 0 || _height <= 0)
 		return 0;
-
-	_vm->updateDirtyRect(0, x_left, x_right, y_top, y_bottom, _dirty_id);
 
 	if ((uint) y_top > (uint) _outheight)
 		y_top = 0;