[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.151,1.152

Max Horn fingolfin at users.sourceforge.net
Sun Dec 21 05:45:02 CET 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv26125

Modified Files:
	object.cpp 
Log Message:
Fix for bug #847805 (FOA: Assertion failed crash at lava pit)

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- object.cpp	11 Dec 2003 06:08:43 -0000	1.151
+++ object.cpp	21 Dec 2003 13:44:23 -0000	1.152
@@ -1576,8 +1576,10 @@
 	int i;
 
 	for (i = 1; i < _numLocalObjects; i++) {
-		if (!_objs[i].obj_nr)
+		if (!_objs[i].obj_nr) {
+			memset(&_objs[i], 0, sizeof(_objs[i]));
 			return i;
+		}
 	}
 
 	return -1;





More information about the Scummvm-git-logs mailing list