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 From fc6ab89b504e15ea14208301acd727893d113381 Mon Sep 17 00:00:00 2001 From: Matthew Hoops Date: Thu, 20 Sep 2012 11:48:00 -0400 Subject: SCUMM: Add support for Indy4 Mac 68k sound --- engines/scumm/sound.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/scumm/sound.cpp') diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 15701f166d..32152420a5 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -250,7 +250,7 @@ void Sound::playSound(int soundID) { // Support for sampled sound effects in Monkey Island 1 and 2 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) + && !_vm->isMacM68kV5() && READ_BE_UINT32(ptr) == MKTAG('S','B','L',' ')) { debugC(DEBUG_SOUND, "Using SBL sound effect"); -- cgit v1.2.3 From 2a9d98003e07890dc74694b62bd694d1fc8a19f3 Mon Sep 17 00:00:00 2001 From: Matthew Hoops Date: Thu, 20 Sep 2012 11:58:04 -0400 Subject: SCUMM: Restrict the Mac m68k v5 driver to MI2/Indy4 Shouldn't be used with MI1 --- engines/scumm/sound.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/scumm/sound.cpp') diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 32152420a5..60a7fbe968 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -250,7 +250,7 @@ void Sound::playSound(int soundID) { // Support for sampled sound effects in Monkey Island 1 and 2 else if (_vm->_game.platform != Common::kPlatformFMTowns // The Macintosh version of MI2 just ignores SBL effects. - && !_vm->isMacM68kV5() + && !_vm->isMacM68kIMuse() && READ_BE_UINT32(ptr) == MKTAG('S','B','L',' ')) { debugC(DEBUG_SOUND, "Using SBL sound effect"); -- cgit v1.2.3 From b105104534d31fc80fb73ba34bf1913d1cd4cb87 Mon Sep 17 00:00:00 2001 From: Matthew Hoops Date: Thu, 20 Sep 2012 12:00:13 -0400 Subject: SCUMM: Update comments --- engines/scumm/sound.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/scumm/sound.cpp') diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 60a7fbe968..43c86db85f 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -249,7 +249,7 @@ void Sound::playSound(int soundID) { } // Support for sampled sound effects in Monkey Island 1 and 2 else if (_vm->_game.platform != Common::kPlatformFMTowns - // The Macintosh version of MI2 just ignores SBL effects. + // The Macintosh m68k versions of MI2/Indy4 just ignore SBL effects. && !_vm->isMacM68kIMuse() && READ_BE_UINT32(ptr) == MKTAG('S','B','L',' ')) { debugC(DEBUG_SOUND, "Using SBL sound effect"); -- cgit v1.2.3 From 89abab97e3124fa25eb4c7d3e8b38501747a8d17 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Wed, 26 Sep 2012 04:17:31 +0200 Subject: JANITORIAL: Remove trailing whitespaces. Powered by: git ls-files "*.cpp" "*.h" "*.m" "*.mm" | xargs sed -i -e 's/[ \t]*$//' --- engines/scumm/sound.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/scumm/sound.cpp') diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 43c86db85f..a1cecfa0b3 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -957,7 +957,7 @@ void Sound::setupSfxFile() { if (file.open(tmp)) _sfxFilename = tmp; - + if (_vm->_game.heversion <= 74) _sfxFileEncByte = 0x69; @@ -1182,7 +1182,7 @@ int ScummEngine::readSoundResource(ResId idx) { // its sound resources, and Amiga games, which feature only ROL // resources, since we are a doing Midi -> AdLib conversion for // these. - if ((_sound->_musicType == MDT_ADLIB || _sound->_musicType == MDT_TOWNS) && pri != 16 + if ((_sound->_musicType == MDT_ADLIB || _sound->_musicType == MDT_TOWNS) && pri != 16 && pri != 15 && pri != 10 && pri != 2 && _game.platform != Common::kPlatformAmiga) pri = -1; -- cgit v1.2.3