[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.319,2.320 resource.h,1.13,1.14 script_v6.cpp,1.419,1.420

[Max Horn]

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

Modified Files:
	intern.h resource.h script_v6.cpp 
Log Message:
Make Array stuff part of the V6 engine class (note: it's a bit confusing to have two different ArrayHeader structs, maybe we should rename them?)

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.319
retrieving revision 2.320
diff -u -d -r2.319 -r2.320
--- intern.h	27 Nov 2004 02:47:45 -0000	2.319
+++ intern.h	27 Nov 2004 13:13:41 -0000	2.320
@@ -342,6 +342,30 @@
 		const char *desc;
 	};
 	
+	enum ArrayType {
+		kBitArray = 1,
+		kNibbleArray = 2,
+		kByteArray = 3,
+		kStringArray = 4,
+		kIntArray = 5,
+		kDwordArray = 6
+	};
+	
+	#if !defined(__GNUC__)
+		#pragma START_PACK_STRUCTS
+	#endif	
+	
+	struct ArrayHeader {
+		int16 dim1;
+		int16 type;
+		int16 dim2;
+		byte data[1];
+	} GCC_PACK;
+	
+	#if !defined(__GNUC__)
+		#pragma END_PACK_STRUCTS
+	#endif
+
 	const OpcodeEntryV6 *_opcodesV6;
 
 	int _smushFrameRate;

Index: resource.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- resource.h	21 Sep 2004 12:57:38 -0000	1.13
+++ resource.h	27 Nov 2004 13:13:41 -0000	1.14
@@ -23,30 +23,6 @@
 
 namespace Scumm {
 
-enum ArrayType {
-	kBitArray = 1,
-	kNibbleArray = 2,
-	kByteArray = 3,
-	kStringArray = 4,
-	kIntArray = 5,
-	kDwordArray = 6
-};
-
-#if !defined(__GNUC__)
-	#pragma START_PACK_STRUCTS
-#endif	
-
-struct ArrayHeader {
-	int16 dim1;
-	int16 type;
-	int16 dim2;
-	byte data[1];
-} GCC_PACK;
-
-#if !defined(__GNUC__)
-	#pragma END_PACK_STRUCTS
-#endif
-
 enum {
 	OF_OWNER_MASK = 0x0F,
 	OF_STATE_MASK = 0xF0,

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -d -r1.419 -r1.420
--- script_v6.cpp	22 Oct 2004 10:25:55 -0000	1.419
+++ script_v6.cpp	27 Nov 2004 13:13:41 -0000	1.420
@@ -397,7 +397,7 @@
 	return obj;
 }
 
-ArrayHeader *ScummEngine_v6::defineArray(int array, int type, int dim2, int dim1) {
+ScummEngine_v6::ArrayHeader *ScummEngine_v6::defineArray(int array, int type, int dim2, int dim1) {
 	if (_heversion >= 72)
 		error("Call to old defineArray");
 
@@ -487,7 +487,7 @@
 
 #define SWAP16(x)  x = SWAP_BYTES_16(x)
 
-ArrayHeader *ScummEngine_v6::getArray(int array) {
+ScummEngine_v6::ArrayHeader *ScummEngine_v6::getArray(int array) {
 	ArrayHeader *ah = (ArrayHeader *)getResourceAddress(rtString, readVar(array));
 	if (!ah)
 		return 0;