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

[bonki]

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:
c4dfa57e6f TUCKER: Add comment about earlier commit e018efbc22 fixing Trac#6645


Commit: c4dfa57e6f91246b545c1ba1c0767a4f3f2abca5
    https://github.com/scummvm/scummvm/commit/c4dfa57e6f91246b545c1ba1c0767a4f3f2abca5
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-03-17T21:18:46+01:00

Commit Message:
TUCKER: Add comment about earlier commit e018efbc22 fixing Trac#6645

Changed paths:
    engines/tucker/tucker.cpp


diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp
index 5cd0f4a..6ea6bce 100644
--- a/engines/tucker/tucker.cpp
+++ b/engines/tucker/tucker.cpp
@@ -3780,6 +3780,11 @@ int TuckerEngine::setLocationAnimationUnderCursor() {
 			continue;
 		}
 		if (_locationAnimationsTable[i]._selectable == 0) {
+			// WORKAROUND
+			// The original game does a "return -1" here which is not correct in
+			// case of overlapping hotspots.
+			// This most prominently fixes Trac#6645, a bug where the cellar in part three
+			// could be entered without having done the cellar door puzzle first.
 			continue;
 		}
 		_selectedObjectType = 1;