[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.171,1.172

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Sun Jun 13 13:01:06 CEST 2004


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

Modified Files:
	object.cpp 
Log Message:
Applied my suggested fix for bug #960674, now that Fingolfin has had the
chance to look at it.


Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -d -r1.171 -r1.172
--- object.cpp	17 Mar 2004 01:50:14 -0000	1.171
+++ object.cpp	13 Jun 2004 20:00:46 -0000	1.172
@@ -925,15 +925,6 @@
 	if (obj < _numActors)
 		error("Can't set actor %d name with new-name-of", obj);
 
-	const byte *objptr = getOBCDFromObject(obj);
-	if (_version <= 5 && !objptr) {
-		// WORKAROUND bug #587553 and possibly other related script bug.
-		// We do not error out but rather just generate a warning.
-		debug(2, "Can't find OBCD to rename object %d", obj);
-		return;
-	} else if (_version == 6 && !objptr)
-		error("Can't set name of object %d", obj);
-
 	for (i = 0; i < _numNewNames; i++) {
 		if (_newNames[i] == obj) {
 			nukeResource(rtObjectName, i);





More information about the Scummvm-git-logs mailing list