[Scummvm-git-logs] scummvm master -> 1f2882b5a3b07c675a152f2f5e553f40c4bbd5b5

athrxx athrxx at scummvm.org
Tue Jul 23 17:58:15 CEST 2019


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:
3ec025db4d KYRA: (HOF) - minor GMM/RTL fix
1f2882b5a3 KYRA: (HOF/FM-TOWNS) - fix intro glitch


Commit: 3ec025db4d11d5d08df0503c7d1bf1f88e235ec3
    https://github.com/scummvm/scummvm/commit/3ec025db4d11d5d08df0503c7d1bf1f88e235ec3
Author: athrxx (athrxx at scummvm.org)
Date: 2019-07-23T17:56:37+02:00

Commit Message:
KYRA: (HOF) - minor GMM/RTL fix

The game would error out when trying to return to the launcher via GMM right at the beginning (due to trying to load files based on incompletely initialized data).

Changed paths:
    engines/kyra/engine/kyra_hof.cpp


diff --git a/engines/kyra/engine/kyra_hof.cpp b/engines/kyra/engine/kyra_hof.cpp
index 94eca12..ef8b119 100644
--- a/engines/kyra/engine/kyra_hof.cpp
+++ b/engines/kyra/engine/kyra_hof.cpp
@@ -261,7 +261,8 @@ Common::Error KyraEngine_HoF::go() {
 	_menuDirectlyToLoad &= saveFileLoadable(0);
 
 	if (menuChoice & 1) {
-		startup();
+		if (!shouldQuit())
+			startup();
 		if (!shouldQuit())
 			runLoop();
 		cleanup();


Commit: 1f2882b5a3b07c675a152f2f5e553f40c4bbd5b5
    https://github.com/scummvm/scummvm/commit/1f2882b5a3b07c675a152f2f5e553f40c4bbd5b5
Author: athrxx (athrxx at scummvm.org)
Date: 2019-07-23T17:56:37+02:00

Commit Message:
KYRA: (HOF/FM-TOWNS) - fix intro glitch

Get rid of alternative anim frame triggers in cases where animations stop too early (e. g. the tree in the first scene not vanishing completely).

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


diff --git a/engines/kyra/sequence/sequences_hof.cpp b/engines/kyra/sequence/sequences_hof.cpp
index 5f41faa..3c28372 100644
--- a/engines/kyra/sequence/sequences_hof.cpp
+++ b/engines/kyra/sequence/sequences_hof.cpp
@@ -1864,12 +1864,14 @@ int SeqPlayer_HOF::cbHOF_overview(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 		playSoundAndDisplaySubTitle(1);
 		break;
 
-	CASE_ALT(434, 354)
+	case 434:
+	//CASE_ALT(434, 354)
 		closeNestedAnimation(0);
 		startNestedAnimation(0, kNestedSequenceDragon);
 		break;
 
-	CASE_ALT(540, 400)
+	case 540:
+	//CASE_ALT(540, 400)
 		waitForSubTitlesTimeout();
 		closeNestedAnimation(0);
 		setCountDown(0);
@@ -1938,7 +1940,8 @@ int SeqPlayer_HOF::cbHOF_library(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 		playSoundAndDisplaySubTitle(6);
 		break;
 
-	CASE_ALT(660, 480)
+	case 660:
+	//CASE_ALT(660, 480)
 		_screen->copyPage(2, 12);
 		waitForSubTitlesTimeout();
 		closeNestedAnimation(0);





More information about the Scummvm-git-logs mailing list