[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.62,1.63 base-costume.h,1.7,1.8 costume.cpp,1.47,1.48 costume.h,1.15,1.16

[Max Horn]

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

Modified Files:
	akos.cpp base-costume.h costume.cpp costume.h 
Log Message:
more costume cleanup; fixed small regression I introduced (copy & paste, sigh)

Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63

Index: base-costume.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/base-costume.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- costume.cpp	29 May 2003 10:31:04 -0000	1.47
+++ costume.cpp	29 May 2003 10:46:07 -0000	1.48
@@ -184,10 +184,11 @@
 	if (y_top >= (int)_outheight || y_bottom <= 0)
 		return 0;
 
-	_docontinue = 0;
 	if (x_left >= _vm->_screenWidth || x_right <= 0)
 		return 1;
 
+	v1.replen = 0;
+
 	if (_mirror) {
 		if (!use_scaling)
 			skip = -v1.x;
@@ -195,7 +196,6 @@
 			_width2 -= skip;
 			codec1_ignorePakCols(skip);
 			v1.x = 0;
-			_docontinue = 1;
 		} else {
 			skip = x_right - _vm->_screenWidth;
 			if (skip <= 0) {
@@ -211,7 +211,6 @@
 			_width2 -= skip;
 			codec1_ignorePakCols(skip);
 			v1.x = _vm->_screenWidth - 1;
-			_docontinue = 1;
 		} else {
 			skip = -1 - x_left;
 			if (skip <= 0)
@@ -284,12 +283,12 @@
 	y = v1.y;
 	src = _srcptr;
 	dst = v1.destptr;
-	len = v1.repcolor;
+	len = v1.replen;
 	color = v1.repcolor;
 	height = _height;
 	width = _width2;
 
-	if (_docontinue)
+	if (v1.replen)
 		goto StartPos;
 
 	do {

Index: costume.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- costume.h	29 May 2003 10:31:05 -0000	1.15
+++ costume.h	29 May 2003 10:46:07 -0000	1.16
@@ -52,7 +52,6 @@
 
 	byte _scaleIndexX;						/* must wrap at 256 */
 	byte _scaleIndexY, _scaleIndexYTop;
-	byte _docontinue;
 	byte _palette[32];
 
 public: