[Scummvm-cvs-logs] SF.net SVN: scummvm: [24080] scummvm/trunk/engines/scumm/script.cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 24080
          http://svn.sourceforge.net/scummvm/?rev=24080&view=rev
Author:   eriktorbjorn
Date:     2006-10-02 14:38:39 -0700 (Mon, 02 Oct 2006)

Log Message:
-----------
Workaround for bug #1555938 ("MI2: Inventory object cloning"), as suggested by
Fingolfin.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/script.cpp

Modified: scummvm/trunk/engines/scumm/script.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script.cpp	2006-10-02 20:13:48 UTC (rev 24079)
+++ scummvm/trunk/engines/scumm/script.cpp	2006-10-02 21:38:39 UTC (rev 24080)
@@ -150,6 +150,13 @@
 	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;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.