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

[bluegr]

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:
dc5a8de28a SCUMM: SAMNMAX - Add Missing actor animation in German CD version, fixes bug #12249


Commit: dc5a8de28a25c61c07ef4245d1c5a714516371a7
    https://github.com/scummvm/scummvm/commit/dc5a8de28a25c61c07ef4245d1c5a714516371a7
Author: Ben Castricum (github at bencastricum.nl)
Date: 2021-10-24T00:01:24+03:00

Commit Message:
SCUMM: SAMNMAX - Add Missing actor animation in German CD version, fixes bug #12249

for details, see bugreport.

I tested all the other CD versions from GOG as well, but the German version
seems to be to only one missing the animation.

Changed paths:
    engines/scumm/string.cpp


diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp
index d99f3574d5..f33131ef93 100644
--- a/engines/scumm/string.cpp
+++ b/engines/scumm/string.cpp
@@ -1357,6 +1357,17 @@ int ScummEngine::convertMessageToString(const byte *msg, byte *dst, int dstSize)
 			error("convertMessageToString: buffer overflow");
 	}
 
+	// WORKAROUND bug #12249 (occurs also in original): Missing actor animation in German CD version of SAMNMAX
+	// Adding the missing animation escape sequence while copying the text fixes it.
+	if (_game.id == GID_SAMNMAX && _roomResource == 56 && vm.slot[_currentScript].number == 200) {
+		if (_language == Common::DE_DEU && vm.slot[_currentScript].offs == 0x0000e5e6) {
+			*dst++ = 0xFF;
+			*dst++ = 0x09;
+			*dst++ = 0x0E;
+			*dst++ = 0x00;
+		}
+	}
+
 	// 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.