[Scummvm-git-logs] scummvm master -> 468575ed0665b1d43227fe69d845f3e6af1c71d1

[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:
468575ed06 SCUMM: Only apply Trac#2215 subtitle workaround when Indy uses the gold box


Commit: 468575ed0665b1d43227fe69d845f3e6af1c71d1
    https://github.com/scummvm/scummvm/commit/468575ed0665b1d43227fe69d845f3e6af1c71d1
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-10-12T13:03:36+02:00

Commit Message:
SCUMM: Only apply Trac#2215 subtitle workaround when Indy uses the gold box

This subtitle bug only happens if Indy has the gold box and is about to
use it, right after finding the beads in Crete. Document this, and don't
apply the workaround if we're not in this case, since this pauses Indy's
animation for no reason.

See the difference in behavior with the two old savegames included
in Trac#2215 issue.

Also make this an enhancement, while there.

Tested with the Floppy/French, DOS/Talkie/English and
Macintosh/Talkie/English releases. Original issue also in DREAMM.

Changed paths:
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 860be3d73ee..f7b10714c5c 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -2817,11 +2817,13 @@ void ScummEngine_v5::o5_stopScript() {
 
 	script = getVarOrDirectByte(PARAM_1);
 
-	if (_game.id == GID_INDY4 && script == 164 &&
-		_roomResource == 50 && vm.slot[_currentScript].number == 213 && VAR(VAR_HAVE_MSG)) {
+	if (_game.id == GID_INDY4 && script == 164 && _roomResource == 50 &&
+		vm.slot[_currentScript].number == 213 && VAR(VAR_HAVE_MSG) &&
+		getOwner(933) == VAR(VAR_EGO) && getClass(933, 146) && _enableEnhancements) {
 		// WORKAROUND bug #2215: Due to a script bug, a line of text is skipped
 		// which Indy is supposed to speak when he finds Orichalcum in some old
-		// bones in the caves below Crete.
+		// bones in the caves below Crete, if (and only if) he has already put
+		// some beads in the gold box beforehand. Also happens in DREAMM.
 		_scriptPointer = oldaddr;
 		o5_breakHere();
 		return;