[Scummvm-git-logs] scummvm master -> 6b28000af89754dba0ce67bbc9aee5fcf3dbba38

[bluegr]

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:
6b28000af8 SCUMM: Make it easier to go back to the cave in VGA Loom (bug #13385)


Commit: 6b28000af89754dba0ce67bbc9aee5fcf3dbba38
    https://github.com/scummvm/scummvm/commit/6b28000af89754dba0ce67bbc9aee5fcf3dbba38
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-04-06T07:58:09+03:00

Commit Message:
SCUMM: Make it easier to go back to the cave in VGA Loom (bug #13385)

The object that the click registers on doesn't has an empty object
script, so it won't move you back into the caves. Redirect to the
appropriate object's script instead. I've verified with the built-in
debug mode that the original seems to have the same problem.

In the EGA version, and others I've tried, the problematic object is
later in the object list, so the cave object takes precedence.

Changed paths:
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 6a6d76be4c4..1134409a0bb 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -1081,6 +1081,15 @@ void ScummEngine_v5::o5_findObject() {
 		obj = 609;
 	}
 
+	// WORKAROUND bug #13385: Clicking on the cave entrance to go back into
+	// the dragon caves registers on the incorrect object. Since the object
+	// script is responsible for actually moving you to the other room and
+	// this script is empty, redirect the action to the cave object's
+	// script instead.
+	if (_game.id == GID_LOOM && _game.version == 4 && _currentRoom == 33 && obj == 482 && _enableEnhancements) {
+		obj = 468;
+	}
+
 	setResult(obj);
 }