[Scummvm-git-logs] scummvm master -> 1f0cb06250032f26c427f42ff58f7c8535ce6212

[sev-]

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:
1f0cb06250 SCUMM: Fix a continuity error with George Washington's teeth (DOTT)


Commit: 1f0cb06250032f26c427f42ff58f7c8535ce6212
    https://github.com/scummvm/scummvm/commit/1f0cb06250032f26c427f42ff58f7c8535ce6212
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-08-02T22:06:16+02:00

Commit Message:
SCUMM: Fix a continuity error with George Washington's teeth (DOTT)

You can't make George Washington leave the main hall without starting a
fire, but this fire can't be started if George Washington's is not
wearing the chattering teeth.

So, when he comes back to that room, he should be wearing them, but
this is not the case during the associated cutscene (he does wear them
if you talk to him outside, or come back to this room again after this
cutscene).  So, force costume 69 (chattering teeth) instead of costume
53 (no chattering teeth) for George Washington in this script.

Changed paths:
    engines/scumm/script_v6.cpp


diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index 86252bec681..f923a678dd0 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -1815,7 +1815,16 @@ void ScummEngine_v6::o6_actorOps() {
 
 	switch (subOp) {
 	case 76:		// SO_COSTUME
-		a->setActorCostume(pop());
+		i = pop();
+		// WORKAROUND: There's a small continuity error in DOTT; the fire that
+		// makes Washington leave the room can only exist if he's wearing the
+		// chattering teeth, but yet when he comes back he's not wearing them
+		// during this cutscene.
+		if (_game.id == GID_TENTACLE && _currentRoom == 13 && vm.slot[_currentScript].number == 211 &&
+			a->_number == 8 && i == 53 && _enableEnhancements) {
+			i = 69;
+		}
+		a->setActorCostume(i);
 		break;
 	case 77:		// SO_STEP_DIST
 		j = pop();