Ticket #8955: bs1_no_subtitle.patch

engines/sword1/objectman.cpp

@@ -109 +109 @@
         uint32 offset = _resMan->readUint32(addr + ((textId & ITM_ID) + 1)* 4);
         if (offset == 0) {
                 warning("ObjectMan::lockText(%d): text number has no text lines", textId);
-                return _errorStr;
+                return _missingSubTitleStr;
         }
         return addr + offset;
 }
@@ -161 +161 @@
         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[] = " ";
 
 } // 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[];
 };
 
 } // End of namespace Sword1