aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorJohannes Schickel2011-08-09 19:16:24 +0200
committerJohannes Schickel2011-08-10 00:00:06 +0200
commit37a34e6da26fff8c5b0298874b9e3e26dcb34b29 (patch)
tree720a23a4708daf077c2feeae00f581ddc84b2d87 /engines
parent00d25a77a9d8297fdc356c7a10f9dc2d94903a5f (diff)
downloadscummvm-rg350-37a34e6da26fff8c5b0298874b9e3e26dcb34b29.tar.gz
scummvm-rg350-37a34e6da26fff8c5b0298874b9e3e26dcb34b29.tar.bz2
scummvm-rg350-37a34e6da26fff8c5b0298874b9e3e26dcb34b29.zip
SCUMM: Do not pack structs in CMS code.
Diffstat (limited to 'engines')
-rw-r--r--engines/scumm/player_v2cms.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/engines/scumm/player_v2cms.h b/engines/scumm/player_v2cms.h
index cbad46fe5d..29444b18bc 100644
--- a/engines/scumm/player_v2cms.h
+++ b/engines/scumm/player_v2cms.h
@@ -50,7 +50,6 @@ public:
virtual bool isStereo() const { return true; }
private:
-#include "common/pack-start.h" // START STRUCT PACKING
struct Voice {
byte attack;
byte decay;
@@ -60,7 +59,7 @@ private:
int16 vibrato;
int16 vibrato2;
int16 noise;
- } PACKED_STRUCT;
+ };
struct Voice2 {
byte *amplitudeOutput;
@@ -105,14 +104,13 @@ private:
Voice2 *nextVoice;
byte chanNumber;
- } PACKED_STRUCT;
+ };
struct MusicChip {
byte ampl[4];
byte freq[4];
byte octave[2];
- } PACKED_STRUCT;
-#include "common/pack-end.h" // END STRUCT PACKING
+ };
Voice _cmsVoicesBase[16];
Voice2 _cmsVoices[8];