[Scummvm-cvs-logs] SF.net SVN: scummvm: [25629] scummvm/trunk/engines/scumm/imuse/instrument. cpp

[fingolfin at users.sourceforge.net]

Revision: 25629
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25629&view=rev
Author:   fingolfin
Date:     2007-02-16 04:34:30 -0800 (Fri, 16 Feb 2007)

Log Message:
-----------
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 :/)

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse/instrument.cpp

Modified: scummvm/trunk/engines/scumm/imuse/instrument.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse/instrument.cpp	2007-02-16 11:14:54 UTC (rev 25628)
+++ scummvm/trunk/engines/scumm/imuse/instrument.cpp	2007-02-16 12:34:30 UTC (rev 25629)
@@ -144,6 +144,9 @@
 
 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 @@
 		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 @@
 
 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 @@
 			byte tva_env_sustain_level;
 		} partial[4];
 		byte checksum;
-	} GNUPACK;
+	};
+
+#include "common/pack-end.h"	// END STRUCT PACKING
+
 	RolandInstrument _instrument;
 
 	char _instrument_name [11];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.