[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.221,1.222

Max Horn fingolfin at users.sourceforge.net
Sat Apr 9 02:50:32 CEST 2005


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

Modified Files:
	object.cpp 
Log Message:
Fix check of the return value of findLocalObjectSlot() in loadFlObject()

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -d -r1.221 -r1.222
--- object.cpp	8 Apr 2005 15:14:49 -0000	1.221
+++ object.cpp	9 Apr 2005 09:49:55 -0000	1.222
@@ -1634,7 +1634,8 @@
 	findObjectInRoom(&foir, foImageHeader | foCodeHeader, object, room);
 
 	// Add an entry for the new floating object in the local object table
-	if (!(objslot = findLocalObjectSlot()))
+	objslot = findLocalObjectSlot();
+	if (objslot == -1)
 		error("loadFlObject: Local Object Table overflow");
 
 	od = &_objs[objslot];





More information about the Scummvm-git-logs mailing list