From f59cf1fcdc88959d87072205a41f542c12e73e37 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 21 Jul 2006 21:25:17 +0000
Subject: Removing GCC_PACK, we fully rely on START_PACK_STRUCTS /
 END_PACK_STRUCTS now (hiya eriktorbjorn, this one is for you *ggg*)

svn-id: r23547
---
 engines/gob/game.h    | 20 ++++++++++----------
 engines/gob/goblin.h  |  6 +++---
 engines/gob/map.h     |  4 ++--
 engines/gob/mult.h    | 18 +++++++++---------
 engines/gob/scenery.h | 10 +++++-----
 engines/gob/video.h   |  2 +-
 6 files changed, 30 insertions(+), 30 deletions(-)

(limited to 'engines/gob')

diff --git a/engines/gob/game.h b/engines/gob/game.h
index eaecf5a17f..4cbc183f44 100644
--- a/engines/gob/game.h
+++ b/engines/gob/game.h
@@ -46,7 +46,7 @@ public:
 		int16 funcEnter;
 		int16 funcLeave;
 		int16 field_12; // New in GOB2
-	} GCC_PACK;
+	};
 
 #define szGame_TotResItem (4 + 2 + 2 + 2)
 	struct TotResItem {
@@ -55,7 +55,7 @@ public:
 		int16 size;
 		int16 width;
 		int16 height;
-	} GCC_PACK;
+	};
 
 #define szGame_TotResTable (2 + 1)
 	struct TotResTable {
@@ -63,7 +63,7 @@ public:
 		byte unknown;
 		TotResItem *items;
 		char *dataPtr;
-	} GCC_PACK;
+	};
 
 #define szGame_ExtItem (4 + 2 + 2 + 2)
 	struct ExtItem {
@@ -71,41 +71,41 @@ public:
 		uint16 size;
 		int16 width;		// width&0x7fff - width, width&0x8000 - pack flag
 		int16 height;		// not zero
-	} GCC_PACK;
+	};
 
 #define szGame_ExtTable (2 + 1)
 	struct ExtTable {
 		int16 itemsCount;
 		byte unknown;
 		ExtItem* items;
-	} GCC_PACK;
+	};
 
 #define szGame_TotTextItem (2 + 2)
 	struct TotTextItem {
 		int16 offset;
 		int16 size;
-	} GCC_PACK;
+	};
 
 #define szGame_TotTextTable (2)
 	struct TotTextTable {
 		int16 itemsCount;
 		TotTextItem *items;
 		char *dataPtr;
-	} GCC_PACK;
+	};
 
 	struct InputDesc {
 		int16 fontIndex;
 		int16 backColor;
 		int16 frontColor;
 		char *ptr;
-	} GCC_PACK;
+	};
 
 	struct ImdCoord {
 		int16 left;
 		int16 top;
 		int16 right;
 		int16 bottom;
-	} GCC_PACK;
+	};
 
 	struct Imd {
 		int16 fileHandle;
@@ -129,7 +129,7 @@ public:
 		ImdCoord *frameCoords;
 		int32 frameDataSize;
 		int32 vidBufferSize;
-	} GCC_PACK;
+	};
 
 #if defined(END_PACK_STRUCTS)
 #pragma END_PACK_STRUCTS
diff --git a/engines/gob/goblin.h b/engines/gob/goblin.h
index dc63fdef93..3bc6d263c7 100644
--- a/engines/gob/goblin.h
+++ b/engines/gob/goblin.h
@@ -51,7 +51,7 @@ public:
 		int16 freq;		// +Ah, high/low byte * 100 - frequency
 		int16 repCount;	// +Ch high/low byte - repeat count
 		int16 sndFrame;		// +Eh
-	} GCC_PACK;
+	};
 
 	typedef Gob_State *Gob_PState;
 
@@ -90,12 +90,12 @@ public:
 		char multObjIndex;	// +37h, from which play mult animations
 		char unk14;			// +38h
 		char visible;		// +39h
-	} GCC_PACK;
+	};
 
 	struct Gob_Pos {
 		char x;
 		char y;
-	} GCC_PACK;
+	};
 
 #if defined(END_PACK_STRUCTS)
 #pragma END_PACK_STRUCTS
diff --git a/engines/gob/map.h b/engines/gob/map.h
index cc5e2b3432..c4d4f5a452 100644
--- a/engines/gob/map.h
+++ b/engines/gob/map.h
@@ -51,7 +51,7 @@ public:
 		int16 x;
 		int16 y;
 		int16 field_2; // Gob2
-	} GCC_PACK;
+	};
 
 #define szMap_ItemPos 3
 
@@ -59,7 +59,7 @@ public:
 		int8 x;
 		int8 y;
 		int8 orient;		// ??
-	} GCC_PACK;
+	};
 
 #if defined(END_PACK_STRUCTS)
 #pragma END_PACK_STRUCTS
diff --git a/engines/gob/mult.h b/engines/gob/mult.h
index 18b6b9565b..50f678e61a 100644
--- a/engines/gob/mult.h
+++ b/engines/gob/mult.h
@@ -64,7 +64,7 @@ public:
 		int8 somethingAnimation; // New in GOB2
 		int8 somethingLayer;     // New in GOB2
 		int8 somethingFrame;     // New in GOB2
-	} GCC_PACK;
+	};
 
 	struct Mult_GobState {
 		int16 animation; // .
@@ -105,7 +105,7 @@ public:
 	struct Mult_StaticKey {
 		int16 frame;
 		int16 layer;
-	} GCC_PACK;
+	};
 
 	struct Mult_AnimKey {
 		int16 frame;
@@ -113,7 +113,7 @@ public:
 		int16 posX;
 		int16 posY;
 		int16 order;
-	} GCC_PACK;
+	};
 
 	struct Mult_TextKey {
 		int16 frame;
@@ -121,7 +121,7 @@ public:
 		int16 unknown0[9];
 		int16 index;
 		int16 unknown1[2];
-	} GCC_PACK;
+	};
 
 	struct Mult_PalKey {
 		int16 frame;
@@ -130,14 +130,14 @@ public:
 		int16 unknown0;
 		int16 unknown1;
 		int8 subst[16][4];
-	} GCC_PACK;
+	};
 
 	struct Mult_PalFadeKey {
 		int16 frame;
 		int16 fade;
 		int16 palIndex;
 		int8 flag;
-	} GCC_PACK;
+	};
 
 	struct Mult_SndKey {
 		int16 frame;
@@ -147,7 +147,7 @@ public:
 		int16 repCount;
 		int16 resId;
 		int16 soundIndex;
-	} GCC_PACK;
+	};
 
 	struct Mult_SomeKey {
 		int16 frame;
@@ -158,7 +158,7 @@ public:
 		int16 field_A;
 		int16 field_C;
 		int16 field_E;
-	} GCC_PACK;
+	};
 
 #if defined(END_PACK_STRUCTS)
 #pragma END_PACK_STRUCTS
@@ -344,7 +344,7 @@ public:
 		char *somepointer09; // ?
 		char *somepointer10; // ?
 		char *execPtr;
-	} GCC_PACK;
+	};
 #pragma END_PACK_STRUCTS
 
 	Mult_Data *_multData2; // TODO: This'll be _multData once every function using it
diff --git a/engines/gob/scenery.h b/engines/gob/scenery.h
index 9ce1f7eded..925130e687 100644
--- a/engines/gob/scenery.h
+++ b/engines/gob/scenery.h
@@ -37,7 +37,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()
-	} GCC_PACK;
+	};
 
 	struct StaticPlane {
 		int8 pictIndex;
@@ -46,13 +46,13 @@ public:
 		int16 destX;
 		int16 destY;
 		int8 transp;
-	} GCC_PACK;
+	};
 
 	struct StaticLayer {
 		int16 backResId;
 		int16 planeCount;
 		StaticPlane *planes;
-	} GCC_PACK;
+	};
 
 	// Animations
 
@@ -62,7 +62,7 @@ public:
 		int8 destX;
 		int8 destY;
 		int8 notFinal;
-	} GCC_PACK;
+	};
 
 	struct AnimLayer {
 		int16 unknown0;
@@ -73,7 +73,7 @@ public:
 		int8 transp;
 		int16 framesCount;
 		AnimFramePiece *frames;
-	} GCC_PACK;
+	};
 
 #if defined(END_PACK_STRUCTS)
 #pragma END_PACK_STRUCTS
diff --git a/engines/gob/video.h b/engines/gob/video.h
index 8bb7a6f14c..f9c48b0e0e 100644
--- a/engines/gob/video.h
+++ b/engines/gob/video.h
@@ -81,7 +81,7 @@ public:
 		byte red;
 		byte green;
 		byte blue;
-	} GCC_PACK;
+	};
 
 #if defined(END_PACK_STRUCTS)
 #pragma END_PACK_STRUCTS
-- 
cgit v1.2.3