[Scummvm-git-logs] scummvm master -> 4c41632a01a3b98982702cb17ed34e9283431dec

[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:
4c41632a01 SAGA: Fix a hitzone detection bug in ITE


Commit: 4c41632a01a3b98982702cb17ed34e9283431dec
    https://github.com/scummvm/scummvm/commit/4c41632a01a3b98982702cb17ed34e9283431dec
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-04-14T18:28:04+02:00

Commit Message:
SAGA: Fix a hitzone detection bug in ITE

Changed paths:
    engines/saga/script.cpp


diff --git a/engines/saga/script.cpp b/engines/saga/script.cpp
index 8a99c490cb..08af70a00d 100644
--- a/engines/saga/script.cpp
+++ b/engines/saga/script.cpp
@@ -1693,6 +1693,17 @@ void Script::whichObject(const Point& mousePoint) {
 		if (_vm->_scene->getHeight() >= mousePoint.y) {
 			newObjectId = _vm->_actor->hitTest(mousePoint, true);
 
+			// WORKAROUND for #10369
+			// For some reason at Alamma's cottage hitTest returns the cottage door objectId when using it with an item.
+			// This makes it hard to use the letter item with the actual door and progress the story,
+			// so we reset it to ID_NOTHING here.
+			if (_vm->getGameId() == GID_ITE) {
+				if (_vm->_scene->currentChapterNumber() == 0 && _vm->_scene->currentSceneNumber() == 15) {
+					if (newObjectId == 8295 && _currentVerb == getVerbType(kVerbUse))
+						newObjectId = ID_NOTHING;
+				}
+			}
+
 			if (newObjectId != ID_NOTHING) {
 				if (objectTypeId(newObjectId) == kGameObjectObject) {
 					objectId = newObjectId;