diff options
| author | Max Horn | 2007-07-01 18:18:43 +0000 |
|---|---|---|
| committer | Max Horn | 2007-07-01 18:18:43 +0000 |
| commit | e1bcd70436656ed48933aadca38636f70348c842 (patch) | |
| tree | fe324a6c31f5c368277c3b9e9fd42e0440f8dc7f /engines/sky | |
| parent | f7041f94ce0a28ed21b918d1fb05ba66f131ea6d (diff) | |
| download | scummvm-rg350-e1bcd70436656ed48933aadca38636f70348c842.tar.gz scummvm-rg350-e1bcd70436656ed48933aadca38636f70348c842.tar.bz2 scummvm-rg350-e1bcd70436656ed48933aadca38636f70348c842.zip | |
Re-added __attribute__(packed)
svn-id: r27830
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 cf769cb3e9..c0dc227718 100644 --- a/engines/sky/sound.cpp +++ b/engines/sky/sound.cpp @@ -46,13 +46,13 @@ struct RoomList { uint8 room; uint8 adlibVolume; uint8 rolandVolume; -}; +} PACKED_STRUCT; struct Sfx { uint8 soundNo; uint8 flags; RoomList roomList[10]; -}; +} PACKED_STRUCT; #include "common/pack-end.h" // END STRUCT PACKING diff --git a/engines/sky/struc.h b/engines/sky/struc.h index 25f0b3d772..cd7155f282 100644 --- a/engines/sky/struc.h +++ b/engines/sky/struc.h @@ -55,7 +55,7 @@ struct dataFileHeader { int16 s_offset_x; int16 s_offset_y; uint16 s_compressed_size; -}; +} PACKED_STRUCT; struct TurnTable { uint16 turnTableUp[5]; @@ -63,7 +63,7 @@ struct TurnTable { uint16 turnTableLeft[5]; uint16 turnTableRight[5]; uint16 turnTableTalk[5]; -}; +} PACKED_STRUCT; struct MegaSet { uint16 gridWidth; // 0 @@ -82,7 +82,7 @@ struct MegaSet { uint16 standRightId; // 11 uint16 standTalkId; // 12 uint16 turnTableId; // 13 -}; +} PACKED_STRUCT; struct Compact { uint16 logic; // 0: Entry in logic table to run (byte as <256entries in logic table @@ -165,7 +165,7 @@ struct Compact { MegaSet megaSet1; // MegaSet megaSet2; // MegaSet megaSet3; // -}; +} PACKED_STRUCT; #include "common/pack-end.h" // END STRUCT PACKING |