Ticket #1636: object.diff

File object.diff, 711 bytes (added by eriktorbjorn, 17 years ago)

Patch against a May 27 CVS snapshot

  • scumm/object.cpp

    old new  
    925925        if (obj < _numActors)
    926926                error("Can't set actor %d name with new-name-of", obj);
    927927
    928         const byte *objptr = getOBCDFromObject(obj);
    929         if (_version <= 5 && !objptr) {
    930                 // WORKAROUND bug #587553 and possibly other related script bug.
    931                 // We do not error out but rather just generate a warning.
    932                 debug(2, "Can't find OBCD to rename object %d", obj);
    933                 return;
    934         } else if (_version == 6 && !objptr)
    935                 error("Can't set name of object %d", obj);
    936 
    937928        for (i = 0; i < _numNewNames; i++) {
    938929                if (_newNames[i] == obj) {
    939930                        nukeResource(rtObjectName, i);