[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.252,1.253

[kirben]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4624/scumm

Modified Files:
	object.cpp 
Log Message:

loadFlObject() should use object index, when checking if object is already loaded. Matches original games and prevent multiple load of same flObject in HE games.


Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -d -r1.252 -r1.253
--- object.cpp	14 Oct 2005 02:13:33 -0000	1.252
+++ object.cpp	14 Oct 2005 08:39:27 -0000	1.253
@@ -1695,17 +1695,17 @@
 
 void ScummEngine::loadFlObject(uint object, uint room) {
 	FindObjectInRoom foir;
-	int slot, objslot;
+	int i, slot, objslot;
 	ObjectData *od;
 	byte *flob;
 	uint32 obcd_size, obim_size, flob_size;
 	bool isRoomLocked, isRoomScriptsLocked;
 
 	// Don't load an already loaded object
-	if (whereIsObject(object) != WIO_NOT_FOUND)
+	if (getObjectIndex(object) != -1)
 		return;
 
-	int i;
+	// Don't load an already stored object
 	for (i = 0; i < _numStoredFlObjects; i++) {
 		if (_storedFlObjects[i].obj_nr == object)
 			return;