[Scummvm-cvs-logs] CVS: scummvm/scumm script_v72he.cpp,2.165,2.166

Travis Howell kirben at users.sourceforge.net
Sun Oct 10 04:36:59 CEST 2004


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

Modified Files:
	script_v72he.cpp 
Log Message:

Correct order


Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.165
retrieving revision 2.166
diff -u -d -r2.165 -r2.166
--- script_v72he.cpp	10 Oct 2004 06:32:01 -0000	2.165
+++ script_v72he.cpp	10 Oct 2004 11:31:22 -0000	2.166
@@ -1405,13 +1405,13 @@
 		if (id == 0) {
 			defineArray(array, kDwordArray, dim2start, dim2end, dim1start, dim1end);
 		}
-		tmp2 = len;
+		tmp2 = 0;
 		while (dim2start <= dim2end) {
 			tmp = dim1start;
 			while (tmp <= dim1end) {
-				writeArray(array, dim2start, tmp, list[--tmp2]);
-				if (tmp2 == 0)
-					tmp2 = len;
+				writeArray(array, dim2start, tmp, list[tmp2++]);
+				if (tmp2 == len)
+					tmp2 = 0;
 				tmp++;
 			}
 			dim2start++;
@@ -1601,10 +1601,7 @@
 	const uint8 *dataPtr = getResourceAddress(restype, pwi->resNum);
 	if (dataPtr) {
 		const uint8 *wizh = findWrappedBlock(MKID('WIZH'), dataPtr, pwi->state, 0);
-		if (!wizh) {
-			warning("WIZH not found");
-			return 0;
-		}
+		assert(wizh);
 		uint32 comp   = READ_LE_UINT32(wizh + 0x0);
 		uint32 width  = READ_LE_UINT32(wizh + 0x4);
 		uint32 height = READ_LE_UINT32(wizh + 0x8);





More information about the Scummvm-git-logs mailing list