MadMoose's bugfix for 555890 - DOTT: Inventory items not changing name

svn-id: r4427
This commit is contained in:
James Brown 2002-06-25 02:04:43 +00:00
parent 88e176f155
commit 38f89eff0b
2 changed files with 17 additions and 2 deletions

View file

@ -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 *)" ";