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/scumm/imuse/instrument.cpp | |
| 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/scumm/imuse/instrument.cpp')
| -rw-r--r-- | engines/scumm/imuse/instrument.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/scumm/imuse/instrument.cpp b/engines/scumm/imuse/instrument.cpp index 23b325c20b..b6ed064bc9 100644 --- a/engines/scumm/imuse/instrument.cpp +++ b/engines/scumm/imuse/instrument.cpp @@ -149,7 +149,7 @@ private: #include "common/pack-start.h" // START STRUCT PACKING - struct { + struct AdlibInstrument { byte flags_1; byte oplvl_1; byte atdec_1; @@ -166,10 +166,12 @@ private: byte flags_b; struct { byte a,b,c,d,e,f,g,h; } extra_b; byte duration; - } _instrument; + } PACKED_STRUCT; #include "common/pack-end.h" // END STRUCT PACKING + AdlibInstrument _instrument; + public: Instrument_Adlib(const byte *data); Instrument_Adlib(Serializer *s); @@ -241,7 +243,7 @@ private: byte tva_env_sustain_level; } partial[4]; byte checksum; - }; + } PACKED_STRUCT; #include "common/pack-end.h" // END STRUCT PACKING |