diff options
| author | Max Horn | 2006-07-09 13:01:15 +0000 |
|---|---|---|
| committer | Max Horn | 2006-07-09 13:01:15 +0000 |
| commit | f35f4a4d1c41a8d186621b912b985dd5d796632a (patch) | |
| tree | 1468779935932e47d32e838458df8d2cf3a5bbe8 /engines/gob | |
| parent | 880838514f28fd298e6418f2096d61b3f757e237 (diff) | |
| download | scummvm-rg350-f35f4a4d1c41a8d186621b912b985dd5d796632a.tar.gz scummvm-rg350-f35f4a4d1c41a8d186621b912b985dd5d796632a.tar.bz2 scummvm-rg350-f35f4a4d1c41a8d186621b912b985dd5d796632a.zip | |
Use START_PACK_STRUCTS / END_PACK_STRUCTS when available, instead of checking for GCC / not GCC
svn-id: r23458
Diffstat (limited to 'engines/gob')
| -rw-r--r-- | engines/gob/game.h | 6 | ||||
| -rw-r--r-- | engines/gob/goblin.h | 7 | ||||
| -rw-r--r-- | engines/gob/map.h | 4 | ||||
| -rw-r--r-- | engines/gob/mult.h | 6 | ||||
| -rw-r--r-- | engines/gob/scenery.h | 7 | ||||
| -rw-r--r-- | engines/gob/video.h | 4 |
6 files changed, 34 insertions, 0 deletions
diff --git a/engines/gob/game.h b/engines/gob/game.h index ff4d133800..eaecf5a17f 100644 --- a/engines/gob/game.h +++ b/engines/gob/game.h @@ -31,7 +31,10 @@ namespace Gob { class Game { public: +#if defined(START_PACK_STRUCTS) #pragma START_PACK_STRUCTS +#endif + struct Collision { int16 id; int16 left; @@ -127,7 +130,10 @@ public: int32 frameDataSize; int32 vidBufferSize; } GCC_PACK; + +#if defined(END_PACK_STRUCTS) #pragma END_PACK_STRUCTS +#endif TotResTable *_totResourceTable; Collision *_collisionAreas; diff --git a/engines/gob/goblin.h b/engines/gob/goblin.h index 6058595ece..dc63fdef93 100644 --- a/engines/gob/goblin.h +++ b/engines/gob/goblin.h @@ -37,7 +37,11 @@ namespace Gob { class Goblin { public: + +#if defined(START_PACK_STRUCTS) #pragma START_PACK_STRUCTS +#endif + struct Gob_State { int16 animation;// +0h int16 layer; // +2h @@ -92,7 +96,10 @@ public: char x; char y; } GCC_PACK; + +#if defined(END_PACK_STRUCTS) #pragma END_PACK_STRUCTS +#endif Util::List *_objList; Gob_Object *_goblins[4]; diff --git a/engines/gob/map.h b/engines/gob/map.h index 606af141d0..cc5e2b3432 100644 --- a/engines/gob/map.h +++ b/engines/gob/map.h @@ -43,7 +43,9 @@ public: kDirSE = 0x5100 }; +#if defined(START_PACK_STRUCTS) #pragma START_PACK_STRUCTS +#endif struct Point { int16 x; @@ -59,7 +61,9 @@ public: int8 orient; // ?? } GCC_PACK; +#if defined(END_PACK_STRUCTS) #pragma END_PACK_STRUCTS +#endif int16 _mapWidth; int16 _mapHeight; diff --git a/engines/gob/mult.h b/engines/gob/mult.h index 54c2526a32..18b6b9565b 100644 --- a/engines/gob/mult.h +++ b/engines/gob/mult.h @@ -31,7 +31,11 @@ namespace Gob { class Mult { public: + +#if defined(START_PACK_STRUCTS) #pragma START_PACK_STRUCTS +#endif + struct Mult_AnimData { int8 animation; int8 layer; @@ -156,7 +160,9 @@ public: int16 field_E; } GCC_PACK; +#if defined(END_PACK_STRUCTS) #pragma END_PACK_STRUCTS +#endif // Globals diff --git a/engines/gob/scenery.h b/engines/gob/scenery.h index e8121b9398..9ce1f7eded 100644 --- a/engines/gob/scenery.h +++ b/engines/gob/scenery.h @@ -27,7 +27,11 @@ namespace Gob { class Scenery { public: + +#if defined(START_PACK_STRUCTS) #pragma START_PACK_STRUCTS +#endif + struct PieceDesc { int16 left; //NOTE: int16 right; //These are stored in Little Endian format @@ -70,7 +74,10 @@ public: int16 framesCount; AnimFramePiece *frames; } GCC_PACK; + +#if defined(END_PACK_STRUCTS) #pragma END_PACK_STRUCTS +#endif struct Static { int16 layersCount; diff --git a/engines/gob/video.h b/engines/gob/video.h index 24c331d875..880df95e84 100644 --- a/engines/gob/video.h +++ b/engines/gob/video.h @@ -72,7 +72,9 @@ public: #define RETURN_PRIMARY 0x01 #define DISABLE_SPR_ALLOC 0x20 +#if defined(START_PACK_STRUCTS) #pragma START_PACK_STRUCTS +#endif struct Color { byte red; @@ -80,7 +82,9 @@ public: byte blue; } GCC_PACK; +#if defined(END_PACK_STRUCTS) #pragma END_PACK_STRUCTS +#endif struct PalDesc { Color *vgaPal; |