Ticket #2826: mi2-rope.diff

engines/scumm/object.cpp

@@ -1225 +1225 @@
 
         debug(1, "Adding object %d from room %d into inventory", obj, room);
 
-        if (whereIsObject(obj) == WIO_FLOBJECT) {
+        switch (whereIsObject(obj)) {
+        case WIO_INVENTORY:
+                // The object is already carried. This can happen when pulling
+                // the rope in Monkey Island 2. See bug #1555938.
+                return;
+        case WIO_FLOBJECT:
                 idx = getObjectIndex(obj);
                 assert(idx >= 0);
                 ptr = getResourceAddress(rtFlObject, _objs[idx].fl_object_index) + 8;
                 size = READ_BE_UINT32(ptr + 4);
-        } else {
+                break;
+        default:
                 findObjectInRoom(&foir, foCodeHeader, obj, room);
                 if (_game.features & GF_OLD_BUNDLE)
                         size = READ_LE_UINT16(foir.obcd);
@@ -1239 +1245 @@
                 else
                         size = READ_BE_UINT32(foir.obcd + 4);
                 ptr = foir.obcd;
+                break;
         }
 
         slot = getInventorySlot();