diff options
| author | Nicolas Bacca | 2004-03-28 21:44:41 +0000 |
|---|---|---|
| committer | Nicolas Bacca | 2004-03-28 21:44:41 +0000 |
| commit | 039e06c59c68b7dbabdf77f9a7800e701f4de60d (patch) | |
| tree | 3c53362a9980d708589b2d66162439b0aa2150ac /queen | |
| parent | 0fb22df46c60d3592a195488e8dd223b3bac4ccb (diff) | |
| download | scummvm-rg350-039e06c59c68b7dbabdf77f9a7800e701f4de60d.tar.gz scummvm-rg350-039e06c59c68b7dbabdf77f9a7800e701f4de60d.tar.bz2 scummvm-rg350-039e06c59c68b7dbabdf77f9a7800e701f4de60d.zip | |
Fix bug #925059
svn-id: r13416
Diffstat (limited to 'queen')
| -rw-r--r-- | queen/music.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/queen/music.cpp b/queen/music.cpp index b8e86f7543..6f783e7916 100644 --- a/queen/music.cpp +++ b/queen/music.cpp @@ -264,7 +264,11 @@ static const byte mt32_to_gm[128] = { byte *idx = ((byte *)data) + 0x200; for (uint i = 0; i < packedSize; i++) +#if defined(SCUMM_NEED_ALIGNMENT) + memcpy(&_buf[i], &data[*(idx + i)], sizeof(uint16)); +#else _buf[i] = data[*(idx + i)]; +#endif musicPtr = ((byte *)_buf) + ((*musicPtr == 0x63) ? 1 : 0); size = packedSize * 2; |