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

[dwatteau]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
c1ae2c4044 SCUMM: INDY4: Drop bogus text in Monte Carlo in the German release (Trac#2055)


Commit: c1ae2c40449e63e5fd94c44d4fd5f0413e063982
    https://github.com/scummvm/scummvm/commit/c1ae2c40449e63e5fd94c44d4fd5f0413e063982
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-06-30T21:34:54+02:00

Commit Message:
SCUMM: INDY4: Drop bogus text in Monte Carlo in the German release (Trac#2055)

In the official German release of Indy4, bogus "Across-arms " text
appears at the end of a couple of strings, when speaking with Sophia
after a failed seance with Trottier in Monte Carlo.

Since we already fix similar "bogus placeholder text" issues in Monkey1,
Indy4 and Full Throttle, it seems fair to now do the same for this case
reported a long, long time ago.

(Note that, because of the way script 28-204 builds and passes on these
strings, the fix has to be made in convertMessageToString() instead of
decodeParseStringTextString(), and using isScriptRunning() instead of
currentScriptSlotIs()).

Changed paths:
    engines/scumm/string.cpp


diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp
index 7dba1e64d25..72fd29cdf1a 100644
--- a/engines/scumm/string.cpp
+++ b/engines/scumm/string.cpp
@@ -1566,6 +1566,18 @@ int ScummEngine::convertMessageToString(const byte *msg, byte *dst, int dstSize)
 		}
 	}
 
+	// WORKAROUND bug #2055: German Indy4 has bogus "Across-arms " text at
+	// the end of some strings, when speaking with Sophia after a failed
+	// seance with Trottier in Monte Carlo.  Because of the way these
+	// strings are built and handled by script 28-204, the fix has to be
+	// done here and this way...
+	if (_game.id == GID_INDY4 && _language == Common::DE_DEU && _currentRoom == 28 &&
+		isScriptRunning(204) && enhancementEnabled(kEnhTextLocFixes)) {
+		const size_t bogusTextLen = sizeof("Across-arms ") - 1;
+		if (dstSize - (end - dst) > bogusTextLen && memcmp(dst - bogusTextLen, "Across-arms ", bogusTextLen) == 0)
+			dst -= bogusTextLen;
+	}
+
 	// WORKAROUND: Russian The Dig pads messages with 03. No idea why
 	// it does not work as is with our rendering code, thus fixing it
 	// with a workaround.