[Scummvm-git-logs] scummvm master -> 4939404410ce00409b2daac647c9bef0de17d69f

[dwatteau]

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:
c131f1241c SCUMM: Make German Sam & Max WORKAROUND for Trac#12249 an enhancement
4939404410 SCUMM: Make Sam & Max WORKAROUND for Trac#269 an enhancement


Commit: c131f1241c03b7d318e386c203091835f4ecfb12
    https://github.com/scummvm/scummvm/commit/c131f1241c03b7d318e386c203091835f4ecfb12
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-01-17T19:37:17+01:00

Commit Message:
SCUMM: Make German Sam & Max WORKAROUND for Trac#12249 an enhancement

This comes from an original script error in this release, and so its fix
qualifies as an enhancement.

Changed paths:
    engines/scumm/string.cpp


diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp
index 49085559dce..8a09341d9af 100644
--- a/engines/scumm/string.cpp
+++ b/engines/scumm/string.cpp
@@ -1360,8 +1360,9 @@ int ScummEngine::convertMessageToString(const byte *msg, byte *dst, int dstSize)
 	}
 
 	// WORKAROUND bug #12249 (occurs also in original): Missing actor animation in German versions of SAMNMAX
-	// Adding the missing animation escape sequence while copying the text fixes it.
-	if (_game.id == GID_SAMNMAX && _currentRoom == 56 && vm.slot[_currentScript].number == 200 && _language == Common::DE_DEU) {
+	// Adding the missing startAnim(14) animation escape sequence while copying the text fixes it.
+	if (_game.id == GID_SAMNMAX && _currentRoom == 56 && vm.slot[_currentScript].number == 200 &&
+		_language == Common::DE_DEU && _enableEnhancements) {
 		// 0xE5E6 is the CD version, 0xE373 is for the floppy version
 		if (vm.slot[_currentScript].offs == 0xE5E6 || vm.slot[_currentScript].offs == 0xE373) {
 			*dst++ = 0xFF;


Commit: 4939404410ce00409b2daac647c9bef0de17d69f
    https://github.com/scummvm/scummvm/commit/4939404410ce00409b2daac647c9bef0de17d69f
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-01-17T19:53:41+01:00

Commit Message:
SCUMM: Make Sam & Max WORKAROUND for Trac#269 an enhancement

I've checked with DREAMM that the original has the same behavior, and so
this script fix probably qualifies as an enhancement.

Changed paths:
    engines/scumm/script_v6.cpp


diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index 5ed10c411a1..cc4e2c8350c 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -757,9 +757,9 @@ void ScummEngine_v6::o6_startScript() {
 	// WORKAROUND bug #269: At Dino Bungee National Memorial, the buttons for
 	// the Wally and Rex dinosaurs will always restart their speech, instead of
 	// stopping and starting their speech. This was a script bug in the original
-	// game.
+	// game, which would also block the "That was informative" reaction from Sam.
 	if (_game.id == GID_SAMNMAX && _roomResource == 59 &&
-		vm.slot[_currentScript].number == 201 && script == 48) {
+		vm.slot[_currentScript].number == 201 && script == 48 && _enableEnhancements) {
 		o6_breakHere();
 	}