From b5aaa1d7bcc84f33076744ed0f44c7b4c306a329 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Wed, 19 Sep 2012 15:19:55 +0200 Subject: SCUMM: Don't play SBL effects in MI2 mac. The original does not do this either. --- engines/scumm/sound.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'engines/scumm/sound.cpp') 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. -- cgit v1.2.3