diff options
| author | Travis Howell | 2004-04-17 07:22:02 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-04-17 07:22:02 +0000 |
| commit | 9b904682b18c4a4a7540fb1dca721544a8d448a3 (patch) | |
| tree | 64b6934464e5844492a17baf4e0a051176c1ca7f /scumm | |
| parent | 1ee83cdeadddd84ab8b12e2cb296659172f790a3 (diff) | |
| download | scummvm-rg350-9b904682b18c4a4a7540fb1dca721544a8d448a3.tar.gz scummvm-rg350-9b904682b18c4a4a7540fb1dca721544a8d448a3.tar.bz2 scummvm-rg350-9b904682b18c4a4a7540fb1dca721544a8d448a3.zip | |
Amiga Monkey Island 1 sound update from Quietust:
Allows MP3 music support in demo and full game.
svn-id: r13593
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/sound.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 17f5f888d8..8d40f16c64 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -402,11 +402,12 @@ void Sound::playSound(int soundID) { int track = -1; if (soundID == 50) track = 17; - else if (soundID == 53) - track = 18; - else if ((soundID >= 100) && (soundID <= 118)) { - char tracks[19] = {7,6,4,12,2,2,2,2,5,10,1,16,8,9,13,11,15,3,14}; - track = tracks[soundID - 100]; + else if (ptr[6] == 0x7F && ptr[7] == 0x00 && ptr[8] == 0x80) + { + char tracks[16] = {13,14,10,3,4,9,16,5,1,8,2,15,6,7,11,12}; + if (ptr[9] == 0x0E) + track = 18; + else track = tracks[ptr[9] - 0x23]; } if (track != -1) { playCDTrack(track,((track < 5) || (track > 16)) ? 1 : -1,0,0); |