[Scummvm-git-logs] scummvm master -> bb6f7f883f63b1fe4ee2482f00774c1609cad2d9

[athrxx]

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

Summary:
ae49267243 KYRA: (LoK/Mac) - fix death / restart sound in Kyragem chamber
bb6f7f883f KYRA: (LoK/Mac) - fix final credits


Commit: ae49267243dcdfd6d4fd75150be818a61f652a67
    https://github.com/scummvm/scummvm/commit/ae49267243dcdfd6d4fd75150be818a61f652a67
Author: athrxx (athrxx at scummvm.org)
Date: 2021-11-11T01:46:29+01:00

Commit Message:
KYRA: (LoK/Mac) - fix death / restart sound in Kyragem chamber

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


diff --git a/engines/kyra/sound/sound_mac_lok.cpp b/engines/kyra/sound/sound_mac_lok.cpp
index 0eb67fcad6..493af0b860 100644
--- a/engines/kyra/sound/sound_mac_lok.cpp
+++ b/engines/kyra/sound/sound_mac_lok.cpp
@@ -182,7 +182,7 @@ void SoundMac::playTrack(uint8 track) {
 	} else if (track == 0 || track == 1) {
 		beginFadeOut();
 		return;
-	} else if (_currentResourceSet == kMusicFinale) {
+	} else if (_currentResourceSet == kMusicFinale && track == 2) {
 		_driver->doCommand(1, 0x12c);
 		return;
 	} else {


Commit: bb6f7f883f63b1fe4ee2482f00774c1609cad2d9
    https://github.com/scummvm/scummvm/commit/bb6f7f883f63b1fe4ee2482f00774c1609cad2d9
Author: athrxx (athrxx at scummvm.org)
Date: 2021-11-11T01:46:41+01:00

Commit Message:
KYRA: (LoK/Mac) - fix final credits

These didn't show at all, since the Mac version has a different line break char than apparently all other versions.

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


diff --git a/engines/kyra/sequence/sequences_lok.cpp b/engines/kyra/sequence/sequences_lok.cpp
index bedeec8b0d..d8ad498846 100644
--- a/engines/kyra/sequence/sequences_lok.cpp
+++ b/engines/kyra/sequence/sequences_lok.cpp
@@ -1221,7 +1221,9 @@ struct CreditsLine {
 
 void KyraEngine_LoK::seq_playCredits() {
 	static const uint8 colorMap[] = { 0, 0, 0xC, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-	static const char stringTerms[] = { 0x5, 0xD, 0x0};
+	static const char stringTermsDef[] = { 0x5, 0xD, 0x0};
+	static const char stringTermsMac[] = { 0x5, 0xA, 0x0 };
+	const char *stringTerms = (_flags.platform == Common::kPlatformMacintosh) ? stringTermsMac : stringTermsDef;
 
 	typedef Common::List<CreditsLine> CreditsLineList;
 	CreditsLineList lines;