diff options
| author | Johannes Schickel | 2012-09-20 08:29:03 -0700 |
|---|---|---|
| committer | Johannes Schickel | 2012-09-20 08:29:03 -0700 |
| commit | 4522d182d44134d48ed0de86863f21a128f5f593 (patch) | |
| tree | f9b4c0b1884515108f0ad007009c78e436febaad /engines/scumm/sound.cpp | |
| parent | 0677871ea94356e0a4a224840de691c05c05e8c5 (diff) | |
| parent | c3f37fb1870fb946692b6d67e6d32d2958be2b3a (diff) | |
| download | scummvm-rg350-4522d182d44134d48ed0de86863f21a128f5f593.tar.gz scummvm-rg350-4522d182d44134d48ed0de86863f21a128f5f593.tar.bz2 scummvm-rg350-4522d182d44134d48ed0de86863f21a128f5f593.zip | |
Merge pull request #279 from lordhoto/mi2-mac-sound
Add support for Monkey Island 2 Mac sound.
Diffstat (limited to 'engines/scumm/sound.cpp')
| -rw-r--r-- | engines/scumm/sound.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 1dc026ad52..15701f166d 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -248,7 +248,10 @@ void Sound::playSound(int soundID) { _mixer->playStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID); } // Support for sampled sound effects in Monkey Island 1 and 2 - else if (_vm->_game.platform != Common::kPlatformFMTowns && READ_BE_UINT32(ptr) == MKTAG('S','B','L',' ')) { + else if (_vm->_game.platform != Common::kPlatformFMTowns + // The Macintosh version of MI2 just ignores SBL effects. + && (_vm->_game.platform != Common::kPlatformMacintosh && _vm->_game.id != GID_MONKEY2) + && READ_BE_UINT32(ptr) == MKTAG('S','B','L',' ')) { debugC(DEBUG_SOUND, "Using SBL sound effect"); // SBL resources essentially contain VOC sound data. |