[Scummvm-cvs-logs] CVS: scummvm object.cpp,1.72,1.73 script_v1.cpp,1.115,1.116

[James Brown]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv9779

Modified Files:
	object.cpp script_v1.cpp 
Log Message:
MadMoose's bugfix for 555890 - DOTT: Inventory items not changing name



Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/object.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- object.cpp	4 Jun 2002 23:32:52 -0000	1.72
+++ object.cpp	25 Jun 2002 02:04:43 -0000	1.73
@@ -719,6 +719,7 @@
 byte *Scumm::getObjOrActorName(int obj)
 {
 	byte *objptr;
+	int i;
 
 	if (obj < NUM_ACTORS)
 		return derefActorSafe(obj, "getObjOrActorName")->getActorName();
@@ -730,6 +731,16 @@
 		if (objptr)
 			offset = *(objptr + 18);
 		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);

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- script_v1.cpp	24 Jun 2002 12:32:32 -0000	1.115
+++ script_v1.cpp	25 Jun 2002 02:04:43 -0000	1.116
@@ -1293,9 +1293,13 @@
 
 void Scumm::o5_getActorWalkBox()
 {
+	Actor *a;
 	getResultPos();
-	setResult(derefActorSafe(getVarOrDirectByte(0x80), "o5_getActorWalkbox")->
-						walkbox);
+	a = derefActorSafe(getVarOrDirectByte(0x80), "o5_getActorWalkbox");
+	if (a) // FIXME - bug 572977 workaround
+		setResult(a->walkbox);
+	else
+		setResult(0);
 }
 
 void Scumm::o5_getActorWidth()