[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.73,1.74 costume.cpp,1.53,1.54

[Max Horn]

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

Modified Files:
	akos.cpp costume.cpp 
Log Message:
same change as in the old costume code: just always mask

Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- akos.cpp	30 May 2003 21:37:58 -0000	1.73
+++ akos.cpp	1 Jun 2003 01:00:44 -0000	1.74
@@ -509,7 +509,6 @@
 	int skip = 0, startScaleIndexX, startScaleIndexY;
 	int cur_x, x_right, x_left;
 	int cur_y, y_top, y_bottom;
-	bool charsetmask, masking;
 	int step;
 	byte drawFlag = 1;
 
@@ -690,10 +689,10 @@
 	if (v1.skip_width <= 0 || _height <= 0)
 		return 0;
 
-	if ((uint) y_top > (uint) _outheight)
+	if ((uint) y_top > _outheight)
 		y_top = 0;
 
-	if ((uint) y_bottom > (uint) _outheight)
+	if ((uint) y_bottom > _outheight)
 		y_bottom = _outheight;
 
 	if (_draw_top > y_top)
@@ -703,25 +702,8 @@
 
 	v1.destptr = _outptr + v1.y * _outwidth + v1.x;
 
-	charsetmask =
-		_vm->hasCharsetMask(x_left, y_top + _vm->virtscr[0].topline, x_right,
-												_vm->virtscr[0].topline + y_bottom);
-	masking = false;
-	if (_zbuf != 0) {
-		masking = _vm->isMaskActiveAt(x_left, y_top, x_right, y_bottom,
-										_vm->getResourceAddress(rtBuffer, 9) +
-										_vm->gdi._imgBufOffs[_zbuf] + _vm->_screenStartStrip) != 0;
-	}
-
-	v1.mask_ptr = NULL;
-	if (masking || charsetmask || _shadow_mode) {
-		v1.mask_ptr = _vm->getResourceAddress(rtBuffer, 9) + v1.y * _numStrips + _vm->_screenStartStrip;
-		v1.imgbufoffs = _vm->gdi._imgBufOffs[_zbuf];
-		if (!charsetmask && masking) {
-			v1.mask_ptr += v1.imgbufoffs;
-			v1.imgbufoffs = 0;
-		}
-	}
+	v1.mask_ptr = _vm->getResourceAddress(rtBuffer, 9) + v1.y * _numStrips + _vm->_screenStartStrip;
+	v1.imgbufoffs = _vm->gdi._imgBufOffs[_zbuf];
 
 	codec1_genericDecode();
 	

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- costume.cpp	31 May 2003 13:53:25 -0000	1.53
+++ costume.cpp	1 Jun 2003 01:00:44 -0000	1.54
@@ -229,7 +229,7 @@
 	if (x_left < 0)
 		x_left = 0;
 
-	if ((uint) y_top > (uint) _outheight)
+	if ((uint) y_top > _outheight)
 		y_top = 0;
 
 	if ((uint) y_bottom > _outheight)