[Scummvm-git-logs] scummvm master -> 9f62be621281d94cb8066990d696fa13f1522187

[athrxx]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9f62be6212 KYRA: (LoK/Mac) - fix end sequence music


Commit: 9f62be621281d94cb8066990d696fa13f1522187
    https://github.com/scummvm/scummvm/commit/9f62be621281d94cb8066990d696fa13f1522187
Author: athrxx (athrxx at scummvm.org)
Date: 2021-12-03T15:27:13+01:00

Commit Message:
KYRA: (LoK/Mac) - fix end sequence music

(Thanks to eriktorbjorn for the Basilisk II testing)

Changed paths:
    engines/kyra/sequence/sequences_lok.cpp
    engines/kyra/sound/sound_mac_lok.cpp


diff --git a/engines/kyra/sequence/sequences_lok.cpp b/engines/kyra/sequence/sequences_lok.cpp
index 1a1f8b64e1..3b7b68aaf9 100644
--- a/engines/kyra/sequence/sequences_lok.cpp
+++ b/engines/kyra/sequence/sequences_lok.cpp
@@ -1608,7 +1608,10 @@ int KyraEngine_LoK::handleMalcolmFlag() {
 			_screen->updateScreen();
 			delayUntil(_malcolmTimer2);
 		}
-		snd_playWanderScoreViaMap(51, 1);
+		if (_flags.platform == Common::kPlatformMacintosh)
+			_sound->playTrack(4);
+		else
+			snd_playWanderScoreViaMap(51, 1);
 		delay(60 * _tickLength);
 		_malcolmFlag = 0;
 		return 1;
diff --git a/engines/kyra/sound/sound_mac_lok.cpp b/engines/kyra/sound/sound_mac_lok.cpp
index 3cd6bb39a5..4ec71c7865 100644
--- a/engines/kyra/sound/sound_mac_lok.cpp
+++ b/engines/kyra/sound/sound_mac_lok.cpp
@@ -182,6 +182,9 @@ void SoundMac::playTrack(uint8 track) {
 	} else if (_currentResourceSet == kMusicFinale && track == 2) {
 		_driver->doCommand(1, 0x12c);
 		return;
+	} else if (_currentResourceSet == kMusicFinale && track == 4) {
+		_driver->doCommand(1, 0x12d);
+		return;
 	} else {
 		track -= 11;
 		assert(track < 35);