Ticket #8188: cmi-talk-regression-fix.diff

scummvm/scumm/string.cpp

@@ -970 +970 @@
                 }
         }
 
+        // If the string has a translation ID but no translation was found,
+        // fall back on the untranslated string.
+
         if (text[0] == '/') {
                 byte *pointer = (byte *)strchr((char *)text + 1, '/');
                 if (pointer != NULL) {
                         pointer++;
-                        int l = 0;
-                        while (*pointer != '/' && *pointer != 0xff && *pointer != 0) {
-                                trans_buff[l++] = *pointer++;
-                        }
-                        trans_buff[l] = '\0';
+                        memcpy(trans_buff, pointer, resStrLen(pointer) + 1);
+                        return;
                 }
-                else
-                        trans_buff[0] = '\0';
-                return;
         }
 
+        // As a last resort, use the original string.
+
         memcpy(trans_buff, text, resStrLen(text) + 1);
 }