[Scummvm-git-logs] scummvm master -> 4fd6ea181363acfdaf6f1f292c2ca48f908a4681

[dwatteau]

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:
4fd6ea1813 SCUMM: Make Trac#1452 subtitle workaround for Dig optional


Commit: 4fd6ea181363acfdaf6f1f292c2ca48f908a4681
    https://github.com/scummvm/scummvm/commit/4fd6ea181363acfdaf6f1f292c2ca48f908a4681
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-10-12T13:42:43+02:00

Commit Message:
SCUMM: Make Trac#1452 subtitle workaround for Dig optional

Like the other "missing waitForActor()" workarounds we have.

Changed paths:
    engines/scumm/script_v6.cpp


diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index 7a5e3a8a877..e2080fa5f74 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -2435,7 +2435,7 @@ void ScummEngine_v6::o6_talkActor() {
 	// [0166] (73)   } else {
 	//
 	// Here we simulate that opcode.
-	if (_game.id == GID_DIG && vm.slot[_currentScript].number == 88) {
+	if (_game.id == GID_DIG && vm.slot[_currentScript].number == 88 && _enableEnhancements) {
 		if (offset == 0x158 || offset == 0x214 || offset == 0x231 || offset == 0x278) {
 			_forcedWaitForMessage = true;
 			_scriptPointer--;