[Scummvm-git-logs] scummvm master -> 407f4306ce6fa93c8154c044c057e97d0e538dc1

athrxx noreply at scummvm.org
Mon Nov 22 21:41:49 UTC 2021


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:
407f4306ce KYRA: (LoK/Mac) - minor publisher logo fix


Commit: 407f4306ce6fa93c8154c044c057e97d0e538dc1
    https://github.com/scummvm/scummvm/commit/407f4306ce6fa93c8154c044c057e97d0e538dc1
Author: athrxx (athrxx at scummvm.org)
Date: 2021-11-22T22:37:12+01:00

Commit Message:
KYRA: (LoK/Mac) - minor publisher logo fix

(delay music until after the display of the lgo)

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 e2fca95e4a..5fe6fdac79 100644
--- a/engines/kyra/sequence/sequences_lok.cpp
+++ b/engines/kyra/sequence/sequences_lok.cpp
@@ -106,7 +106,7 @@ void KyraEngine_LoK::seq_intro() {
 
 	_seq->setCopyViewOffs(true);
 	_screen->setFont(_defaultFont);
-	if (_flags.platform == Common::kPlatformDOS || _flags.platform == Common::kPlatformMacintosh)
+	if (_flags.platform == Common::kPlatformDOS || (_flags.platform == Common::kPlatformMacintosh && !_res->exists("MP_GOLD.CPS")))
 		snd_playTheme(0, 2);
 	_text->setTalkCoords(144);
 
@@ -148,8 +148,10 @@ bool KyraEngine_LoK::seq_introPublisherLogos() {
 		_screen->updateScreen();
 		_screen->fadeFromBlack();
 		delay(120 * _tickLength);
-		if (!_abortIntroFlag)
+		if (!_abortIntroFlag) {
 			_screen->fadeToBlack();
+			snd_playTheme(0, 2);
+		}
 	}
 
 	return _abortIntroFlag;




More information about the Scummvm-git-logs mailing list