diff options
| author | Torbjörn Andersson | 2006-05-26 09:36:41 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2006-05-26 09:36:41 +0000 |
| commit | 985215a04a6dfa9a07d7a8987b639c95b1721c24 (patch) | |
| tree | c2c0883ce60a3049a56be63010a49ae9c97687cf /engines/cine/part.h | |
| parent | 003504272565235710a9f742c8763d13182cca5f (diff) | |
| download | scummvm-rg350-985215a04a6dfa9a07d7a8987b639c95b1721c24.tar.gz scummvm-rg350-985215a04a6dfa9a07d7a8987b639c95b1721c24.tar.bz2 scummvm-rg350-985215a04a6dfa9a07d7a8987b639c95b1721c24.zip | |
As far as I can tell, there's no longer any reason for PartBuffer and AnimData
to be packed, so I've removed the packing and added the 'refresh' field to
AnimData instead of having it as a separate array.
On the other hand, animHeaderStruct and animHeader2Struct *should* have been
packed, but weren't. I've changed they way they are initialised so that the
packing should no longer matter for them either.
svn-id: r22651
Diffstat (limited to 'engines/cine/part.h')
| -rw-r--r-- | engines/cine/part.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/engines/cine/part.h b/engines/cine/part.h index f02cf2996d..ff51f8e307 100644 --- a/engines/cine/part.h +++ b/engines/cine/part.h @@ -26,16 +26,13 @@ #define CINE_PART_H_ namespace Cine { -#if !defined(__GNUC__) - #pragma START_PACK_STRUCTS -#endif struct PartBuffer { char partName[14]; uint32 offset; uint32 packedSize; uint32 unpackedSize; -} GCC_PACK; +}; struct AnimData { uint16 width; @@ -48,11 +45,10 @@ struct AnimData { int16 fileIdx; int16 frameIdx; char name[10]; -} GCC_PACK; -#if !defined(__GNUC__) - #pragma END_PACK_STRUCTS -#endif + // Not part of the data, but used when saving/restoring it. + bool refresh; +}; #define NUM_MAX_PARTDATA 255 #define NUM_MAX_ANIMDATA 255 |