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

[bluegr]

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:
c7b1cd6e09 SAGA: IHNM: Added information about global flags 12 and 13
cf3512fea9 SAGA: IHNM: Add a workaround to avoid an unwinnable state - bug #15214


Commit: c7b1cd6e09df8fd531c1700d46491d1844c14575
    https://github.com/scummvm/scummvm/commit/c7b1cd6e09df8fd531c1700d46491d1844c14575
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-11T02:07:17+02:00

Commit Message:
SAGA: IHNM: Added information about global flags 12 and 13

Taken from bug #15214

Changed paths:
    engines/saga/console.cpp


diff --git a/engines/saga/console.cpp b/engines/saga/console.cpp
index 2f89948100d..75808562ea1 100644
--- a/engines/saga/console.cpp
+++ b/engines/saga/console.cpp
@@ -237,8 +237,8 @@ bool Console::cmdGlobalFlagsInfo(int argc, const char **argv) {
 	// 09: Unknown
 	// 10: Unknown
 	// 11: Unknown
-	// 12: Unknown
-	// 13: Unknown
+	// 12: Nimdok looked at mirror
+	// 13: Nimdok ordered the golem to destroy the Lost Tribe
 	// 14: Unknown
 	// 15: Unknown
 	// 16: Used in the final chapter. If it's 0 when a character dies, the "bad" ending for that character is shown


Commit: cf3512fea92b3deb5ab50ea30b566547b11b7af6
    https://github.com/scummvm/scummvm/commit/cf3512fea92b3deb5ab50ea30b566547b11b7af6
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-11T02:07:17+02:00

Commit Message:
SAGA: IHNM: Add a workaround to avoid an unwinnable state - bug #15214

Thanks to @antoniou79 for finding the script bug in Nimdok's chapter

Changed paths:
    engines/saga/script.cpp


diff --git a/engines/saga/script.cpp b/engines/saga/script.cpp
index 7032e02d19f..b161f5f0225 100644
--- a/engines/saga/script.cpp
+++ b/engines/saga/script.cpp
@@ -869,6 +869,16 @@ void Script::opReply(SCRIPTOP_PARAMS) {
 	}
 
 	str = thread->_strings->getString(strID);
+
+	// WORKAROUND for a soft lock after failing Nimdok's chapter - bug #15214:
+	// If the player hasn't interacted with the mirror in Nimdok's chapter
+	// (global flag 12), then the game enters an unwinnable state after the
+	// chapter ends. To avoid this, remove the dialog option where Nimdok orders
+	// the golem to follow him outside and end the chapter, if he hasn't
+	// interacted with the mirror yet.
+	if (_vm->getGameId() == GID_IHNM && strID == 246 && !(_vm->_globalFlags & (1 << 12)))
+		return;
+
 	if (_vm->_interface->converseAddText(str, strID, replyNum, flags, iparam1))
 		warning("Error adding ConverseText (%s, %d, %d, %d)", str, replyNum, flags, iparam1);
 }