ACCESS: Workaround for Exit/walk icon in massacre site scene

1 files changed, 16 insertions, 0 deletions

diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index 4df1131643..ca0d7bf341 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -199,6 +199,22 @@ void AmazonRoom::mainAreaClick() {
 	}
 }
 
+void AmazonRoom::walkCursor() {
+	// WORKAROUND: For scene 29, which is a normal walkable scene, but yet can be
+	// 'exitted'. This workaround ensures the scene will only be left if you click
+	// the Exit icon wgeb the cursor is already a walk cursor
+	EventsManager &events = *_vm->_events;
+
+	if (_vm->_player->_roomNumber == 29 && events._normalMouse != CURSOR_CROSSHAIRS) {
+		events._normalMouse = CURSOR_CROSSHAIRS;
+		events.setCursor(CURSOR_CROSSHAIRS);
+		_selectCommand = -1;
+		_vm->_boxSelect = true;
+	} else {
+		Room::walkCursor();
+	}
+}
+
 void AmazonRoom::init4Quads() {
 	if (!_vm->_screen->_vesaMode)
 		return;