restricted getObjectIndex to only search thru _objs, not _inventory(to avoid future confusion), this might cause regressions, though; fixed o2_getObjPreposition; adapted some code to the changed getObjectIndex

svn-id: r7829

1 files changed, 16 insertions, 1 deletions

diff --git a/scumm/object.cpp b/scumm/object.cpp
index 15cbcfb346..5c2db5cb96 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -129,7 +129,21 @@ int Scumm::getObjectIndex(int object) {
 	if (object < 1)
 		return -1;
 
-	/* OF_OWNER_ROOM should be 0xFF for full throttle, else 0xF */
+#if 1
+	for (i = (_numLocalObjects-1); i > 0; i--) {
+		if (_objs[i].obj_nr == object)
+			return i;
+	}
+	return -1;
+#else
+	// FIXME: this function searches thru the _inventory. Yet almost all
+	// functions calling it assumg the index will always be into _objs.
+	// For script_v2.cpp this already caused some hard to track buglets.
+	// Maybe it also causes problems in other places. The question is,
+	// under which cirumstances would the _inventory result ever be
+	// useful for us?
+
+	// OF_OWNER_ROOM should be 0xFF for full throttle, else 0xF
 	if (_objectOwnerTable[object] != OF_OWNER_ROOM) {
 		for (i = 0; i < _maxInventoryItems; i++)
 			if (_inventory[i] == object)
@@ -142,6 +156,7 @@ int Scumm::getObjectIndex(int object) {
 		}
 		return -1;
 	}
+#endif
 }
 
 int Scumm::whereIsObject(int object) {