From e1bcd70436656ed48933aadca38636f70348c842 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 1 Jul 2007 18:18:43 +0000
Subject: Re-added __attribute__(packed)

svn-id: r27830
---
 engines/scumm/imuse/instrument.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'engines/scumm/imuse/instrument.cpp')

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
 
-- 
cgit v1.2.3