fix endian bug when dealing with ArrayHeader's; added a hack to permit save games broken due to this to still work; moved the whole 'Array' stuff into ScummEngine_v6

svn-id: r12521

1 files changed, 7 insertions, 9 deletions

diff --git a/scumm/resource.h b/scumm/resource.h
index 2cf7f2612f..567981ee14 100644
--- a/scumm/resource.h
+++ b/scumm/resource.h
@@ -31,6 +31,13 @@ struct ResHdr {
 	uint32 tag, size;
 } GCC_PACK;
 
+struct ArrayHeader {
+	int16 dim1;
+	int16 type;
+	int16 dim2;
+	byte data[1];
+} GCC_PACK;
+
 #if !defined(__GNUC__)
 	#pragma END_PACK_STRUCTS
 #endif
@@ -52,15 +59,6 @@ enum {
 };
 
 
-#define ARRAY_HDR_SIZE 6
-struct ArrayHeader {
-	int16 dim1_size;
-	int16 type;
-	int16 dim2_size;
-	byte data[1];
-};
-
-
 const byte *findResource(uint32 tag, const byte *searchin);
 const byte *findResourceSmall(uint32 tag, const byte *searchin);