[Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.66,1.67 base-costume.h,1.10,1.11 base-costume.cpp,2.2,2.3

[James Brown]

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

Modified Files:
	costume.cpp base-costume.h base-costume.cpp 
Log Message:
Attempt some more V1 costume work. Not that it helps yet.


Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- costume.cpp	25 Jun 2003 23:49:54 -0000	1.66
+++ costume.cpp	5 Jul 2003 11:45:17 -0000	1.67
@@ -205,10 +205,11 @@
 			skip = -v1.x;
 		if (skip > 0) {
 			v1.skip_width -= skip;
-			if (_vm->_version != 1)
+
+			if (_vm->_version == 1)
+				V1_ignorePakCols(skip);
+			else
 				codec1_ignorePakCols(skip);
-			else 
-				warning ("TODO: ignore columns for v1 gfx costume codec");
 			v1.x = 0;
 		} else {
 			skip = x_right - _vm->_screenWidth;
@@ -223,10 +224,11 @@
 			skip = x_right - _vm->_screenWidth;
 		if (skip > 0) {
 			v1.skip_width -= skip;
-			if (_vm->_version != 1)
+
+			if (_vm->_version == 1)
+				V1_ignorePakCols(skip);
+			else
 				codec1_ignorePakCols(skip);
-			else 
-				warning ("TODO: ignore columns for v1 gfx costume codec");
 			v1.x = _vm->_screenWidth - 1;
 		} else {
 			skip = -1 - x_left;

Index: base-costume.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/base-costume.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- base-costume.h	5 Jun 2003 02:46:08 -0000	1.10
+++ base-costume.h	5 Jul 2003 11:45:17 -0000	1.11
@@ -128,7 +128,7 @@
 	virtual byte drawLimb(const CostumeData &cost, int limb) = 0;
 
 	void codec1_ignorePakCols(int num);
-
+	void V1_ignorePakCols(int num);
 };
 
 #endif

Index: base-costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/base-costume.cpp,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -d -r2.2 -r2.3
--- base-costume.cpp	29 May 2003 10:43:57 -0000	2.2
+++ base-costume.cpp	5 Jul 2003 11:45:18 -0000	2.3
@@ -61,3 +61,23 @@
 	} while (1);
 }
 
+// FIXME: Call this something sensible, make sure it works
+void BaseCostumeRenderer::V1_ignorePakCols(int num) {
+	int n = _height;
+	warning("Attempting V1 column skip. We don't even make it here, yet.");
+	if (num > 1)
+		n *= num;
+
+	do {
+		v1.repcolor = *_srcptr >> 4;
+		v1.replen = *_srcptr++ & 0x0F;
+
+		if (v1.replen == 0)
+			v1.replen = *_srcptr++;
+
+		do {
+			if (!--n) return;
+		} while (--v1.replen);
+	} while (1);
+}
+