Ticket #8955: bs1_hardcoded_subtitle.patch

engines/sword1/objectman.cpp

@@ -108 +108 @@
         }
         uint32 offset = _resMan->readUint32(addr + ((textId & ITM_ID) + 1)* 4);
         if (offset == 0) {
+                // Workaround bug for missing sentence in some langages in Syria (see bug #1977094).
+                // We use the hardcoded text in this case.
+                if (textId == 2950145)
+                        return const_cast<char*>(_translationId2950145[lang]);
+
                 warning("ObjectMan::lockText(%d): text number has no text lines", textId);
-                return _errorStr;
+                return _missingSubTitleStr;
         }
         return addr + offset;
 }
@@ -161 +166 @@
         memcpy(dest, _liveList, TOTAL_SECTIONS * sizeof(uint16));
 }
 
-char ObjectMan::_errorStr[] = "Error: Text not found.";
+// String displayed when a subtitle sentence is missing in the cluster file.
+// It happens with at least on sentence in Syria in some langages (see bug #1977094).
+// Note: an empty string or a null pointer causes a crash.
+char ObjectMan::_missingSubTitleStr[] = " ";
+
+// Missing translation for textId 2950145 (see bug #1977094).
+// Currently text is missing for German, Spanish and Portuguese languages.
+const char *ObjectMan::_translationId2950145[7] =
+{
+        "Oh?",    // English
+        "Quoi?",  // French
+        " ",      // German <= to replace with german sentence
+        "Eh?",    // Italian
+        " ",      // Spanish <= to replace with spanish sentence
+        "Ano?",   // Czech
+        " "       // Portuguese <= to replace with german sentence
+};
+
 
 } // End of namespace Sword1

engines/sword1/objectman.h

@@ -61 +61 @@
         static const uint32 _textList[TOTAL_SECTIONS][7];       //a table of pointers to text files
         uint16  _liveList[TOTAL_SECTIONS];                                      //which sections are active
         uint8 *_cptData[TOTAL_SECTIONS];
-        static char _errorStr[];
+        static char _missingSubTitleStr[];
+        static const char *_translationId2950145[7];            //translation for textId 2950145 (missing from cluster file for some langages)
 };
 
 } // End of namespace Sword1