[Scummvm-git-logs] scummvm master -> 50ceaca97812074ff6d0afd3526a1afbd281bd46

[AndywinXp]

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:
50ceaca978 SCUMM: INDY3 (VGA DE): Fix lockup after invalid control code


Commit: 50ceaca97812074ff6d0afd3526a1afbd281bd46
    https://github.com/scummvm/scummvm/commit/50ceaca97812074ff6d0afd3526a1afbd281bd46
Author: AndywinXp (andywinxp at gmail.com)
Date: 2024-08-29T13:23:05+02:00

Commit Message:
SCUMM: INDY3 (VGA DE): Fix lockup after invalid control code

Changed paths:
    engines/scumm/script.cpp


diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 8297a0992a4..318c00ef6c9 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -1526,7 +1526,13 @@ int ScummEngine::resStrLen(const byte *src) {
 			// WORKAROUND for bugs #1675 and #2715, script bugs in German Indy3.
 			// For more information, See the the corresponding workaround in
 			// ScummEngine::convertMessageToString().
-			if (enhancementEnabled(kEnhTextLocFixes) && _game.id == GID_INDY3 && _language == Common::DE_DEU &&
+			//
+			// While the twin workaround in convertMessageToString() can be optional,
+			// our code diverges from the original just enough that we can't ignore the
+			// invalid control code at least in INDY3 VGA DE, so the following has to
+			// run regardless of the enhancement settings. Therefore, kEnhGameBreakingBugFixes
+			// is the appropriate class here.
+			if (enhancementEnabled(kEnhGameBreakingBugFixes) && _game.id == GID_INDY3 && _language == Common::DE_DEU &&
 			    ((_roomResource == 23 && chr == 0x2E) ||
 			     (_roomResource == 21 && chr == 0x20))) {
 				num--;