diff options
author | Max Horn | 2007-02-16 12:34:30 +0000 |
---|---|---|
committer | Max Horn | 2007-02-16 12:34:30 +0000 |
commit | 96162c14eab2654802e86ce096e14ee852f9829d (patch) | |
tree | e84721a9b1b507dc04e8d4baf52e7c48e51a9dfd /engines | |
parent | b8bd502c5791fe1b995c5de5d30dd9c805ab472d (diff) | |
download | scummvm-rg350-96162c14eab2654802e86ce096e14ee852f9829d.tar.gz scummvm-rg350-96162c14eab2654802e86ce096e14ee852f9829d.tar.bz2 scummvm-rg350-96162c14eab2654802e86ce096e14ee852f9829d.zip |
Ugh -- these internal iMuse structs were supposed to be packed, but never were explicitly markes as such. Doing that now (might break old savegames on some ports :/)
svn-id: r25629
Diffstat (limited to 'engines')
-rw-r--r-- | engines/scumm/imuse/instrument.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/engines/scumm/imuse/instrument.cpp b/engines/scumm/imuse/instrument.cpp index 90d734f00d..171efe9b4b 100644 --- a/engines/scumm/imuse/instrument.cpp +++ b/engines/scumm/imuse/instrument.cpp @@ -144,6 +144,9 @@ public: class Instrument_Adlib : public InstrumentInternal { private: + +#include "common/pack-start.h" // START STRUCT PACKING + struct { byte flags_1; byte oplvl_1; @@ -163,6 +166,8 @@ private: byte duration; } _instrument; +#include "common/pack-end.h" // END STRUCT PACKING + public: Instrument_Adlib(const byte *data); Instrument_Adlib(Serializer *s); @@ -174,6 +179,9 @@ public: class Instrument_Roland : public InstrumentInternal { private: + +#include "common/pack-start.h" // START STRUCT PACKING + struct RolandInstrument { byte roland_id; byte device_id; @@ -231,7 +239,10 @@ private: byte tva_env_sustain_level; } partial[4]; byte checksum; - } GNUPACK; + }; + +#include "common/pack-end.h" // END STRUCT PACKING + RolandInstrument _instrument; char _instrument_name [11]; |