diff options
| author | Travis Howell | 2003-07-17 12:27:13 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-07-17 12:27:13 +0000 |
| commit | 09984089fb2bbe463c0a64255deff212b39310e7 (patch) | |
| tree | 3aed4699c0f57cc69ed851d4d4642089224f8bfc | |
| parent | 5a1dce2773e2d61497884e39305c40727b7117dc (diff) | |
| download | scummvm-rg350-09984089fb2bbe463c0a64255deff212b39310e7.tar.gz scummvm-rg350-09984089fb2bbe463c0a64255deff212b39310e7.tar.bz2 scummvm-rg350-09984089fb2bbe463c0a64255deff212b39310e7.zip | |
Revert part of last changes.
Caused indy3ega/loom to try to use amiga sound sometimes, when Amiga option was enabled.
svn-id: r9059
| -rw-r--r-- | scumm/sound.cpp | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 8f71882991..375d8d0eba 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -489,22 +489,19 @@ void Sound::playSound(int soundID) { if ((_scumm->_features & GF_AMIGA) && (_scumm->_version == 3)) { // experimental support for Indy3 Amiga sound effects - bool amigatest = (READ_BE_UINT16(ptr + 26) == 0x00FF) || (READ_BE_UINT16(ptr + 26) == 0x0001) || (READ_BE_UINT16(ptr + 26) == 0x0101); - if (amigatest) { - if (READ_BE_UINT16(ptr + 26) == 0x00FF) // looped sound - // TODO: support looping sounds - // ptr + 14 seems to be looping duration - flags = 0; - else if (READ_BE_UINT16(ptr + 26) == 0x0001) // nonlooped sound - flags = 0; // - else if (READ_BE_UINT16(ptr + 26) == 0x0101) // background music - // TODO: support music - return; - size = READ_BE_UINT16(ptr + 12); - rate = 11000; - _scumm->_mixer->playRaw(NULL, ptr + 28, size, rate, flags, soundID); + if (READ_BE_UINT16(ptr + 26) == 0x00FF) // looped sound + // TODO: support looping sounds + // ptr + 14 seems to be looping duration + flags = 0; + else if (READ_BE_UINT16(ptr + 26) == 0x0001) // nonlooped sound + flags = 0; // + else if (READ_BE_UINT16(ptr + 26) == 0x0101) // background music + // TODO: support music return; - } + size = READ_BE_UINT16(ptr + 12); + rate = 11000; + _scumm->_mixer->playRaw(NULL, ptr + 28, size, rate, flags, soundID); + return; } if (_scumm->_features & GF_OLD_BUNDLE) { |