diff options
| author | Max Horn | 2006-07-21 21:25:17 +0000 |
|---|---|---|
| committer | Max Horn | 2006-07-21 21:25:17 +0000 |
| commit | f59cf1fcdc88959d87072205a41f542c12e73e37 (patch) | |
| tree | 7e6488f459a5af7020de29f2ec78a13fcf6f9517 /engines/sky | |
| parent | 348e34c685b2c1c00e1d0a18f145ca4a075069ee (diff) | |
| download | scummvm-rg350-f59cf1fcdc88959d87072205a41f542c12e73e37.tar.gz scummvm-rg350-f59cf1fcdc88959d87072205a41f542c12e73e37.tar.bz2 scummvm-rg350-f59cf1fcdc88959d87072205a41f542c12e73e37.zip | |
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
Diffstat (limited to 'engines/sky')
| -rw-r--r-- | engines/sky/sound.cpp | 4 | ||||
| -rw-r--r-- | engines/sky/struc.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/sky/sound.cpp b/engines/sky/sound.cpp index 0a98c7d070..a178fa082c 100644 --- a/engines/sky/sound.cpp +++ b/engines/sky/sound.cpp @@ -45,13 +45,13 @@ struct RoomList { uint8 room; uint8 adlibVolume; uint8 rolandVolume; -} GCC_PACK; +}; struct Sfx { uint8 soundNo; uint8 flags; RoomList roomList[10]; -} GCC_PACK; +}; #if defined(END_PACK_STRUCTS) #pragma END_PACK_STRUCTS diff --git a/engines/sky/struc.h b/engines/sky/struc.h index 3f34aac5ce..17040a8cea 100644 --- a/engines/sky/struc.h +++ b/engines/sky/struc.h @@ -54,7 +54,7 @@ struct dataFileHeader { int16 s_offset_x; int16 s_offset_y; uint16 s_compressed_size; -} GCC_PACK; +}; struct TurnTable { uint16 turnTableUp[5]; @@ -62,7 +62,7 @@ struct TurnTable { uint16 turnTableLeft[5]; uint16 turnTableRight[5]; uint16 turnTableTalk[5]; -} GCC_PACK; +}; struct MegaSet { uint16 gridWidth; // 0 @@ -81,7 +81,7 @@ struct MegaSet { uint16 standRightId; // 11 uint16 standTalkId; // 12 uint16 turnTableId; // 13 -} GCC_PACK; +}; struct Compact { uint16 logic; // 0: Entry in logic table to run (byte as <256entries in logic table @@ -164,7 +164,7 @@ struct Compact { MegaSet megaSet1; // MegaSet megaSet2; // MegaSet megaSet3; // -} GCC_PACK; +}; #if defined(END_PACK_STRUCTS) #pragma END_PACK_STRUCTS |