[Scummvm-git-logs] scummvm master -> c447a9ccbd628c5e53b3b4b8213092497f2ed2cc

[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:
c447a9ccbd SCUMM: Fix missing Lemonhead line in MI1 Ultimate Talkie (bug #13374)


Commit: c447a9ccbd628c5e53b3b4b8213092497f2ed2cc
    https://github.com/scummvm/scummvm/commit/c447a9ccbd628c5e53b3b4b8213092497f2ed2cc
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-04-03T07:27:35+02:00

Commit Message:
SCUMM: Fix missing Lemonhead line in MI1 Ultimate Talkie (bug #13374)

There was no WaitForMessage() after "Oooh, that's nice." when you give
the wimpy idol to the cannibals, so we simulate one. The other missing
lines, that were mysteriously dropped from the VGA CD version, were
probably never recorded so we make no attempt to reinstate them for this
version.

Changed paths:
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index a0a771dd8b4..74121f4d039 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -1617,6 +1617,19 @@ void ScummEngine_v5::o5_pickupObject() {
 }
 
 void ScummEngine_v5::o5_print() {
+	// WORKAROUND bug #13374: The patched script for the Ultimate Talkie
+	// is missing a WaitForMessage() after Lemonhead says "Oooh, that's
+	// nice." so we insert one here. If there is a future version that
+	// fixes this, the workaround still shouldn't do any harm.
+	//
+	// The workaround is deliberately not marked as an enhancement, since
+	// this version makes so many changes of its own.
+	if (_game.id == GID_MONKEY && _currentRoom == 25 && vm.slot[_currentScript].number == 205 && VAR(VAR_HAVE_MSG) && strcmp(_game.variant, "SE Talkie") == 0) {
+		_scriptPointer--;
+		o5_breakHere();
+		return;
+	}
+
 	_actorToPrintStrFor = getVarOrDirectByte(PARAM_1);
 	decodeParseString();
 }