diff options
Diffstat (limited to 'object.cpp')
-rw-r--r-- | object.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/object.cpp b/object.cpp index 63776d83a0..605c936f9a 100644 --- a/object.cpp +++ b/object.cpp @@ -719,6 +719,7 @@ void Scumm::clearDrawObjectQueue() byte *Scumm::getObjOrActorName(int obj) { byte *objptr; + int i; if (obj < NUM_ACTORS) return derefActorSafe(obj, "getObjOrActorName")->getActorName(); @@ -732,6 +733,16 @@ byte *Scumm::getObjOrActorName(int obj) return (objptr + offset); } + if (_features & GF_AFTER_V6) { + for (i = 1; i < 50; i++) { + if (_newNames[i] == obj) { + debug(5, "Found new name for object %d at _newNames[i]", obj, i); + return getResourceAddress(rtObjectName, i); + break; + } + } + } + objptr = getOBCDFromObject(obj); if (objptr == NULL) return (byte *)" "; |