[Scummvm-git-logs] scummvm master -> 378cf3a953f7572056be837aef8760c595bb9fa3

[eriktorbjorn]

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:
378cf3a953 SCUMM: Make DOTT workaround optional


Commit: 378cf3a953f7572056be837aef8760c595bb9fa3
    https://github.com/scummvm/scummvm/commit/378cf3a953f7572056be837aef8760c595bb9fa3
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-04-08T16:37:03+02:00

Commit Message:
SCUMM: Make DOTT workaround optional

This workaround happens in some cases when Bernard interacts with the
chewing gum on the floor, where he will speak using Laverne's voice. See
bug #3803 for details. I've re-verified that it happens in the original
as well.

Changed paths:
    engines/scumm/detection.cpp
    engines/scumm/script_v6.cpp


diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index f805adfc50e..f68473a9d1a 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -228,7 +228,8 @@ const ExtraGuiOptions ScummMetaEngineDetection::getExtraGuiOptions(const Common:
 		gameid == "samnmax" ||
 		gameid == "loom" ||
 		(gameid == "indy3" && platform == Common::kPlatformMacintosh && extra != "Steam") ||
-		gameid == "atlantis") {
+		gameid == "atlantis" ||
+		gameid == "tentacle") {
 		options.push_back(enableEnhancements);
 	}
 
diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index 24ac0d789b2..49fc29e79e4 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -2374,7 +2374,8 @@ void ScummEngine_v6::o6_talkActor() {
 	// Original script did not check for VAR_EGO == 2 before executing
 	// a talkActor opcode.
 	if (_game.id == GID_TENTACLE && vm.slot[_currentScript].number == 307
-			&& VAR(VAR_EGO) != 2 && _actorToPrintStrFor == 2) {
+			&& VAR(VAR_EGO) != 2 && _actorToPrintStrFor == 2
+			&& _enableEnhancements) {
 		_scriptPointer += resStrLen(_scriptPointer) + 1;
 		return;
 	}