diff options
| author | Torbjörn Andersson | 2004-06-13 20:00:46 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2004-06-13 20:00:46 +0000 |
| commit | a15f20535f5be44c0f8563ccc43403409abfad33 (patch) | |
| tree | c81a2372f59b41afc3f7217c0a595a0c34626d64 | |
| parent | e554f46f71bb478def84544574e6c5ed8a801d5c (diff) | |
| download | scummvm-rg350-a15f20535f5be44c0f8563ccc43403409abfad33.tar.gz scummvm-rg350-a15f20535f5be44c0f8563ccc43403409abfad33.tar.bz2 scummvm-rg350-a15f20535f5be44c0f8563ccc43403409abfad33.zip | |
Applied my suggested fix for bug #960674, now that Fingolfin has had the
chance to look at it.
svn-id: r13957
| -rw-r--r-- | scumm/object.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp index 8a305a127b..adaecfc2ed 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -925,15 +925,6 @@ void ScummEngine::setObjectName(int obj) { 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); |