Ticket #8625: dialog_charset_glitch.patch

engines/scumm/string.cpp

@@ -646 +646 @@
 
 void ScummEngine::drawString(int a, const byte *msg) {
         byte buf[270];
-        byte *space;
+        //byte *space;
         int i, c;
         byte fontHeight = 0;
         uint color;
@@ -688 +688 @@
 
         fontHeight = _charset->getFontHeight();
 
+        //* REPLACED: Is trimming necessary? Trimming deletes spaces when
+        //* editing a savegame name in the original SAVE/LOAD-dialog of Scumm-V3 games, e.g. Indy3.
+        //* When entering a name in those dialogs trailing spaces will not be shown because they are trimmed.
+        //* If it's needed, trim only if (_charset->_center == true) or
+        //* trim a copy of buf to determine the string-width for centering.
+        //* Disabling this section also fixes the Indy3 Grail Diary issue mentioned below.
+        //
         // trim from the right
-        byte *tmp = buf;
-        space = NULL;
-        while (*tmp) {
-                if (*tmp == ' ') {
-                        if (!space)
-                                space = tmp;
-                } else {
-                        space = NULL;
-                }
-                tmp++;
-        }
-        if (space)
-                *space = '\0';
+        //byte *tmp = buf;
+        //space = NULL;
+        //while (*tmp) {
+        //      if (*tmp == ' ') {
+        //              if (!space)
+        //                      space = tmp;
+        //      } else {
+        //              space = NULL;
+        //      }
+        //      tmp++;
+        //}
+        //if (space)
+        //      *space = '\0';
+
         if (_charset->_center) {
                 _charset->_left -= _charset->getStringWidth(a, buf) / 2;
         }
 
         if (!buf[0]) {
-                buf[0] = ' ';
-                buf[1] = 0;
+                //* REPLACED: Does not work with the original SAVE/LOAD-dialog (e.g. indy3).
+                //* If you clicked on an empty savegame slot the name was displayed as " " instead
+                //* of "".
+                //buf[0] = ' ';
+                //buf[1] = 0;
+
+                _charset->_str.left = _charset->_left;
+                _charset->_str.top = _charset->_top;
+                _charset->_str.right = _charset->_left;
+                _charset->_str.bottom = _charset->_top;
         }
 
         for (i = 0; (c = buf[i++]) != 0;) {
@@ -798 +814 @@
                 _nextTop = _charset->_top;
         }
 
-        _string[a].xpos = _charset->_str.right + 8;     // Indy3: Fixes Grail Diary text positioning
+        _string[a].xpos = _charset->_str.right; // + 8; Indy3: Fixes Grail Diary text positioning
 }
 
 int ScummEngine::convertMessageToString(const byte *msg, byte *dst, int dstSize) {