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

[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:
df622224db SCUMM: INDY3 (German): Set invalid control code workarounds as enhancements


Commit: df622224db072878cadb9692f3e57e82011de9ea
    https://github.com/scummvm/scummvm/commit/df622224db072878cadb9692f3e57e82011de9ea
Author: AndywinXp (andywinxp at gmail.com)
Date: 2024-08-27T22:46:23+02:00

Commit Message:
SCUMM: INDY3 (German): Set invalid control code workarounds as enhancements

Changed paths:
    engines/scumm/script.cpp
    engines/scumm/string.cpp


diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index b593d60a891..499e3fd4f5a 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -1526,7 +1526,7 @@ 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 (_game.id == GID_INDY3 && _language == Common::DE_DEU &&
+			if (enhancementEnabled(kEnhTextLocFixes) && _game.id == GID_INDY3 && _language == Common::DE_DEU &&
 			    ((_roomResource == 23 && chr == 0x2E) ||
 			     (_roomResource == 21 && chr == 0x20))) {
 				num--;
diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp
index bbd25feedee..89bdda51d5f 100644
--- a/engines/scumm/string.cpp
+++ b/engines/scumm/string.cpp
@@ -1444,7 +1444,7 @@ int ScummEngine::convertMessageToString(const byte *msg, byte *dst, int dstSize)
 			// here. At least the DOS and Amiga German releases are affected.
 			//
 			// See also ScummEngine::resStrLen().
-			if (_game.id == GID_INDY3 && _language == Common::DE_DEU &&
+			if (enhancementEnabled(kEnhTextLocFixes) && _game.id == GID_INDY3 && _language == Common::DE_DEU &&
 				((_roomResource == 23 && chr == 0x2E) ||
 				 (_roomResource == 21 && chr == 0x20))) {
 				num--;