From bcd4591da43f8d5f67142cbd8034910be7be0493 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Mon, 2 Oct 2006 21:38:39 +0000
Subject: Workaround for bug #1555938 ("MI2: Inventory object cloning"), as
 suggested by Fingolfin.

svn-id: r24080
---
 engines/scumm/script.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 537a736fee..707bf719f4 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -150,6 +150,13 @@ int ScummEngine::getVerbEntrypoint(int obj, int entry) {
 	const byte *objptr, *verbptr;
 	int verboffs;
 
+	// WORKAROUND for bug #1555938: Disallow pulling the rope if it's
+	// already in the player's inventory.
+
+	if (_game.id == GID_MONKEY2 && obj == 1047 && entry == 6 && whereIsObject(obj) == WIO_INVENTORY) {
+		return 0;
+	}
+
 	if (whereIsObject(obj) == WIO_NOT_FOUND)
 		return 0;
 
-- 
cgit v1.2.3