diff options
| author | Max Horn | 2006-07-22 17:28:48 +0000 |
|---|---|---|
| committer | Max Horn | 2006-07-22 17:28:48 +0000 |
| commit | 2859b647026af1a927d1a74100f125bbc0f77db3 (patch) | |
| tree | e842c9e2e67296f5bbc48645ba49b469edb7bd22 /engines/sky | |
| parent | 1ffd49604357ed6fd63e133369a89e3b57711ae2 (diff) | |
| download | scummvm-rg350-2859b647026af1a927d1a74100f125bbc0f77db3.tar.gz scummvm-rg350-2859b647026af1a927d1a74100f125bbc0f77db3.tar.bz2 scummvm-rg350-2859b647026af1a927d1a74100f125bbc0f77db3.zip | |
Fix struct packing issues (macros are not resolve in #pragma params, at least for GCC)
svn-id: r23569
Diffstat (limited to 'engines/sky')
| -rw-r--r-- | engines/sky/sound.cpp | 8 | ||||
| -rw-r--r-- | engines/sky/struc.h | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/engines/sky/sound.cpp b/engines/sky/sound.cpp index a178fa082c..ea21253c5f 100644 --- a/engines/sky/sound.cpp +++ b/engines/sky/sound.cpp @@ -37,9 +37,7 @@ namespace Sky { #define SFXF_START_DELAY 0x80 #define SFXF_SAVE 0x20 -#if defined(START_PACK_STRUCTS) -#pragma START_PACK_STRUCTS -#endif +#include <common/pack-start.h> // START STRUCT PACKING struct RoomList { uint8 room; @@ -53,9 +51,7 @@ struct Sfx { RoomList roomList[10]; }; -#if defined(END_PACK_STRUCTS) -#pragma END_PACK_STRUCTS -#endif +#include <common/pack-end.h> // END STRUCT PACKING uint16 Sound::_speechConvertTable[8] = { 0, //;Text numbers to file numbers diff --git a/engines/sky/struc.h b/engines/sky/struc.h index 17040a8cea..5536991e05 100644 --- a/engines/sky/struc.h +++ b/engines/sky/struc.h @@ -36,9 +36,7 @@ struct displayText_t { uint32 textWidth; }; -#if defined(START_PACK_STRUCTS) -#pragma START_PACK_STRUCTS -#endif +#include <common/pack-start.h> // START STRUCT PACKING struct dataFileHeader { uint16 flag; // bit 0: set for colour data, clear for not @@ -166,9 +164,7 @@ struct Compact { MegaSet megaSet3; // }; -#if defined(END_PACK_STRUCTS) -#pragma END_PACK_STRUCTS -#endif +#include <common/pack-end.h> // END STRUCT PACKING } // End of namespace Sky |