[Scummvm-git-logs] scummvm branch-2-1 -> 44cfb721504feb2d9b96502f95adcf48931dc9bd

athrxx athrxx at scummvm.org
Fri Nov 15 22:44:21 CET 2019


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:
44cfb72150 KYRA: (EOB/Amiga) - fix outro glitch


Commit: 44cfb721504feb2d9b96502f95adcf48931dc9bd
    https://github.com/scummvm/scummvm/commit/44cfb721504feb2d9b96502f95adcf48931dc9bd
Author: athrxx (athrxx at scummvm.org)
Date: 2019-11-15T22:41:26+01:00

Commit Message:
KYRA: (EOB/Amiga) - fix outro glitch

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


diff --git a/engines/kyra/sequence/sequences_eob.cpp b/engines/kyra/sequence/sequences_eob.cpp
index d4aeb52..92facd3 100644
--- a/engines/kyra/sequence/sequences_eob.cpp
+++ b/engines/kyra/sequence/sequences_eob.cpp
@@ -1520,31 +1520,29 @@ void EoBEngine::seq_playFinale() {
 	gui_drawBox(0, 0, 176, 175, guiSettings()->colors.frame1, guiSettings()->colors.frame2, guiSettings()->colors.fill);
 	_txt->printDialogueText(51, _moreStrings[0]);
 
-	if (!checkScriptFlags(0x1FFE)) {
-		_screen->fadeToBlack();
-		return;
-	}
-
-	_txt->printDialogueText(_finBonusStrings[0]);
-	for (int i = 0; i < 6; i++) {
-		_txt->printDialogueText(_finBonusStrings[1]);
-		if (_characters[i].flags & 1)
-			_txt->printDialogueText(_characters[i].name);
-	}
+	if (checkScriptFlags(0x1FFE)) {
+		_txt->printDialogueText(_finBonusStrings[0]);
+		for (int i = 0; i < 6; i++) {
+			_txt->printDialogueText(_finBonusStrings[1]);
+			if (_characters[i].flags & 1)
+				_txt->printDialogueText(_characters[i].name);
+		}
 
-	uint32 password = 0;
-	for (int i = 0; i < 4; i++) {
-		if (!(_characters[i].flags & 1))
-			continue;
+		uint32 password = 0;
+		for (int i = 0; i < 4; i++) {
+			if (!(_characters[i].flags & 1))
+				continue;
 
-		int len = strlen(_characters[i].name);
-		for (int ii = 0; ii < len; ii++) {
-			uint32 c = _characters[i].name[ii];
-			password += (c * c);
+			int len = strlen(_characters[i].name);
+			for (int ii = 0; ii < len; ii++) {
+				uint32 c = _characters[i].name[ii];
+				password += (c * c);
+			}
 		}
+
+		_txt->printDialogueText(Common::String::format(_finBonusStrings[2], password).c_str(), true);
 	}
 
-	_txt->printDialogueText(Common::String::format(_finBonusStrings[2], password).c_str(), true);
 	_screen->fadeToBlack();
 
 	if (_flags.platform == Common::kPlatformAmiga)





More information about the Scummvm-git-logs mailing list