Ticket #8231: setobjectname.patch

script_v2.cpp

@@ -1292 +1292 @@
 
 void Scumm_v2::o2_setObjectName() {
         int obj = getVarOrDirectWord(0x80);
-        int size;
+        int size = 0;
         int a;
         int i = 0;
         byte *name = NULL;
@@ -1303 +1303 @@
                 a = fetchScriptByte();
                 work[i++] = a;
         } while (a);
-        work[i] = 0;
 
         if (obj < _numActors)
                 error("Can't set actor %d name with new-name-of", obj);
@@ -1312 +1311 @@
         if (name == NULL)
                 return; // Silently abort
 
-        byte *objptr;
-        byte offset = 0;
+  while(name[size++])
+    ;
 
-        objptr = getOBCDFromObject(obj);
-        offset = *(objptr + 14);
-        size = READ_LE_UINT16(objptr) - offset;
-
-        if (i >= size) {
+        if (i > size) {
                 warning("New name of object %d too long (old *%s* new *%s*)", obj, name, work);
-                i = size - 1;
+                i = size;
         }
 
-        memcpy(name, work, i + 1);
+  while (i < size) {
+    work[i-1] = '@';
+    i++;
+  }
+  work[i-1] = 0;
+
+        memcpy(name, work, i);
         redrawV2Inventory();
 }