Re-added __attribute__(packed)

svn-id: r27830

7 files changed, 32 insertions, 32 deletions

diff --git a/engines/gob/game.h b/engines/gob/game.h
index 4a1796c6d9..2181d219f2 100644
--- a/engines/gob/game.h
+++ b/engines/gob/game.h
@@ -48,7 +48,7 @@ public:
 		uint16 funcEnter;
 		uint16 funcLeave;
 		uint16 funcSub;
-	};
+	} PACKED_STRUCT;
 
 #define szGame_TotResItem (4 + 2 + 2 + 2)
 	struct TotResItem {
@@ -57,7 +57,7 @@ public:
 		int16 size;
 		int16 width;
 		int16 height;
-	};
+	} PACKED_STRUCT;
 
 #define szGame_TotResTable (2 + 1)
 	struct TotResTable {
@@ -65,7 +65,7 @@ public:
 		byte unknown;
 		TotResItem *items;
 		byte *dataPtr;
-	};
+	} PACKED_STRUCT;
 
 #define szGame_ExtItem (4 + 2 + 2 + 2)
 	struct ExtItem {
@@ -73,34 +73,34 @@ public:
 		uint16 size;
 		int16 width;		// width & 0x7FFF: width, width & 0x8000: pack flag
 		int16 height;		// not zero
-	};
+	} PACKED_STRUCT;
 
 #define szGame_ExtTable (2 + 1)
 	struct ExtTable {
 		int16 itemsCount;
 		byte unknown;
 		ExtItem* items;
-	};
+	} PACKED_STRUCT;
 
 #define szGame_TotTextItem (2 + 2)
 	struct TotTextItem {
 		int16 offset;
 		int16 size;
-	};
+	} PACKED_STRUCT;
 
 #define szGame_TotTextTable (2)
 	struct TotTextTable {
 		int16 itemsCount;
 		TotTextItem *items;
 		byte *dataPtr;
-	};
+	} PACKED_STRUCT;
 
 	struct InputDesc {
 		int16 fontIndex;
 		int16 backColor;
 		int16 frontColor;
 		byte *ptr;
-	};
+	} PACKED_STRUCT;
 
 #include "common/pack-end.h"	// END STRUCT PACKING
 
diff --git a/engines/gob/goblin.h b/engines/gob/goblin.h
index 61ac9dff5e..38c19a48d3 100644
--- a/engines/gob/goblin.h
+++ b/engines/gob/goblin.h
@@ -51,7 +51,7 @@ public:
 		int16 freq;     // high/low byte * 100 - frequency
 		int16 repCount;	// high/low byte - repeat count
 		int16 sndFrame;
-	};
+	} PACKED_STRUCT;
 
 	typedef Gob_State *Gob_PState;
 
@@ -90,12 +90,12 @@ public:
 		char multObjIndex;
 		char unk14;
 		char visible;
-	};
+	} PACKED_STRUCT;
 
 	struct Gob_Pos {
 		char x;
 		char y;
-	};
+	} PACKED_STRUCT;
 
 #include "common/pack-end.h"	// END STRUCT PACKING
 
diff --git a/engines/gob/imd.h b/engines/gob/imd.h
index 3d04f18c6d..27d95cd579 100644
--- a/engines/gob/imd.h
+++ b/engines/gob/imd.h
@@ -41,7 +41,7 @@ public:
 		int16 top;
 		int16 right;
 		int16 bottom;
-	};
+	} PACKED_STRUCT;
 
 	struct Imd {
 		int16 handle;
@@ -65,7 +65,7 @@ public:
 		int32 frameDataSize;
 		int32 vidBufferSize;
 		Video::Color *extraPalette;
-	};
+	} PACKED_STRUCT;
 
 #include "common/pack-end.h"	// END STRUCT PACKING
 
diff --git a/engines/gob/map.h b/engines/gob/map.h
index 9b45c5c04e..0e0a80aad3 100644
--- a/engines/gob/map.h
+++ b/engines/gob/map.h
@@ -51,7 +51,7 @@ public:
 		int16 x;
 		int16 y;
 		int16 notWalkable;
-	};
+	} PACKED_STRUCT;
 
 #define szMap_ItemPos 3
 
@@ -59,7 +59,7 @@ public:
 		int8 x;
 		int8 y;
 		int8 orient;
-	};
+	} PACKED_STRUCT;
 
 #include "common/pack-end.h"	// END STRUCT PACKING
 
diff --git a/engines/gob/mult.h b/engines/gob/mult.h
index 194126cd8b..edfbb682ea 100644
--- a/engines/gob/mult.h
+++ b/engines/gob/mult.h
@@ -63,7 +63,7 @@ public:
 		int8 redrawAnimation;
 		int8 redrawLayer;
 		uint8 redrawFrame;
-	};
+	} PACKED_STRUCT;
 
 	struct Mult_GobState {
 		int16 animation; // .
@@ -74,7 +74,7 @@ public:
 		int16 freq;      // |- [1+]
 		int8 repCount;   // |
 		uint8 speaker;   // '
-	};
+	} PACKED_STRUCT;
 
 	struct Mult_Object {
 		int32 *pPosX;
@@ -104,12 +104,12 @@ public:
 		int16 newTop;
 		int16 newRight;
 		int16 newBottom;
-	};
+	} PACKED_STRUCT;
 
 	struct Mult_StaticKey {
 		int16 frame;
 		int16 layer;
-	};
+	} PACKED_STRUCT;
 
 	struct Mult_AnimKey {
 		int16 frame;
@@ -117,14 +117,14 @@ public:
 		int16 posX;
 		int16 posY;
 		int16 order;
-	};
+	} PACKED_STRUCT;
 
 	struct Mult_TextKey {
 		int16 frame;
 		int16 cmd;
 		char unknown[18];
 		byte script[6];
-	};
+	} PACKED_STRUCT;
 
 	struct Mult_PalKey {
 		int16 frame;
@@ -133,14 +133,14 @@ public:
 		int16 unknown0;
 		int16 unknown1;
 		int8 subst[16][4];
-	};
+	} PACKED_STRUCT;
 
 	struct Mult_PalFadeKey {
 		int16 frame;
 		int16 fade;
 		int16 palIndex;
 		int8 flag;
-	};
+	} PACKED_STRUCT;
 
 	struct Mult_SndKey {
 		int16 frame;
@@ -150,7 +150,7 @@ public:
 		int16 repCount;
 		int16 resId;
 		int16 soundIndex;
-	};
+	} PACKED_STRUCT;
 
 	struct Mult_ImdKey {
 		int16 frame;
@@ -162,7 +162,7 @@ public:
 		int16 lastFrame;
 		int8 palStart;
 		int8 palEnd;
-	};
+	} PACKED_STRUCT;
 
 	struct Mult_Data {
 		int16 palFadeKeysCount;
@@ -212,7 +212,7 @@ public:
 		char *imdFiles;
 		char *somepointer10; // ?
 		byte *execPtr;
-	};
+	} PACKED_STRUCT;
 
 #include "common/pack-end.h"	// END STRUCT PACKING
 
diff --git a/engines/gob/scenery.h b/engines/gob/scenery.h
index 32ff727c46..acb7aecba7 100644
--- a/engines/gob/scenery.h
+++ b/engines/gob/scenery.h
@@ -38,7 +38,7 @@ public:
 		int16 right;		//These are stored in Little Endian format
 		int16 top;		//And should be converted by client code when accessed
 		int16 bottom;		//i.e. use FROM_LE_16()
-	};
+	} PACKED_STRUCT;
 
 	struct StaticPlane {
 		int8 pictIndex;
@@ -47,13 +47,13 @@ public:
 		int16 destX;
 		int16 destY;
 		int8 transp;
-	};
+	} PACKED_STRUCT;
 
 	struct StaticLayer {
 		int16 backResId;
 		int16 planeCount;
 		StaticPlane *planes;
-	};
+	} PACKED_STRUCT;
 
 	// Animations
 
@@ -63,7 +63,7 @@ public:
 		int8 destX;
 		int8 destY;
 		int8 notFinal;
-	};
+	} PACKED_STRUCT;
 
 	struct AnimLayer {
 		int16 unknown0;
@@ -74,7 +74,7 @@ public:
 		int8 transp;
 		int16 framesCount;
 		AnimFramePiece *frames;
-	};
+	} PACKED_STRUCT;
 
 #include "common/pack-end.h"	// END STRUCT PACKING
 
diff --git a/engines/gob/video.h b/engines/gob/video.h
index faa9555abb..51d02bd219 100644
--- a/engines/gob/video.h
+++ b/engines/gob/video.h
@@ -85,7 +85,7 @@ public:
 		byte red;
 		byte green;
 		byte blue;
-	};
+	} PACKED_STRUCT;
 
 #include "common/pack-end.h"	// END STRUCT PACKING