[Scummvm-git-logs] scummvm master -> 5538830bda4c51dd9d57a2cd5ac952dc84a4ed1e

[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:
5538830bda SCUMM: Don't try to apply the Captain Dread glitch workaround on the Ultimate Talkie


Commit: 5538830bda4c51dd9d57a2cd5ac952dc84a4ed1e
    https://github.com/scummvm/scummvm/commit/5538830bda4c51dd9d57a2cd5ac952dc84a4ed1e
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-08-11T11:26:47+02:00

Commit Message:
SCUMM: Don't try to apply the Captain Dread glitch workaround on the Ultimate Talkie

This bug was already fixed in the Ultimate Talkie edition, but a good
part of this script has been rewritten in this version, so I'd rather
avoid triggering any _scriptPointer change there. The Bit[129] check
was probably enough to prevent this, but I'd rather be safe.

Adding the check is also a way of documenting that this version fixed
this.

Changed paths:
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 2b0d9bf1775..1f0e3fe67ff 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -1023,7 +1023,8 @@ void ScummEngine_v5::o5_drawObject() {
 	// face Guybrush even if he's already looking at him.  drawObject() should never
 	// be called if Bit[129] is set in that script, so if it does happen, it means
 	// the check was missing, and so we ignore the next 32 bytes of Dread's reaction.
-	if (_game.id == GID_MONKEY2 && _currentRoom == 22 && vm.slot[_currentScript].number == 201 && obj == 237 && state == 1 && readVar(0x8000 + 129) == 1 && _enableEnhancements) {
+	if (_game.id == GID_MONKEY2 && _currentRoom == 22 && vm.slot[_currentScript].number == 201 && obj == 237 &&
+		state == 1 && readVar(0x8000 + 129) == 1 && _enableEnhancements && strcmp(_game.variant, "SE Talkie") != 0) {
 		_scriptPointer += 32;
 		return;
 	}