[Scummvm-cvs-logs] CVS: scummvm/scumm script_v72he.cpp,2.31,2.32 script_v6.cpp,1.391,1.392

[Max Horn]

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

Modified Files:
	script_v72he.cpp script_v6.cpp 
Log Message:
cleanup

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.31
retrieving revision 2.32
diff -u -d -r2.31 -r2.32
--- script_v72he.cpp	28 Aug 2004 14:05:32 -0000	2.31
+++ script_v72he.cpp	28 Aug 2004 14:48:51 -0000	2.32
@@ -834,9 +834,6 @@
 	int type = fetchScriptByte();
 
 	switch (type) {
-	case 5:		// SO_INT_ARRAY
-		data = kIntArray;
-		break;
 	case 2:		// SO_BIT_ARRAY
 		data = kBitArray;
 		break;
@@ -846,6 +843,9 @@
 	case 4:		// SO_BYTE_ARRAY
 		data = kByteArray;
 		break;
+	case 5:		// SO_INT_ARRAY
+		data = kIntArray;
+		break;
 	case 6:
 		data = kDwordArray;
 		break;

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -d -r1.391 -r1.392
--- script_v6.cpp	28 Aug 2004 04:02:49 -0000	1.391
+++ script_v6.cpp	28 Aug 2004 14:48:51 -0000	1.392
@@ -564,7 +564,7 @@
 		a = _fileHandle.readUint16LE();
 		b = _fileHandle.readUint16LE();
 		c = _fileHandle.readUint16LE();
-		if (c == 1)
+		if (c == kBitArray)
 			defineArray(num, kBitArray, a, b);
 		else
 			defineArray(num, kIntArray, a, b);