Ticket #8759: Indy3_Mac_Diary2.diff

charset.cpp

@@ -1509 +1509 @@
 
 
 void CharsetRendererV3::printChar(int chr, bool ignoreCharsetMask) {
+        // HACK: Indy3 Mac does not show black characters (such as in the grail diary)
+        // if ignoreCharsetMask is true. Fixes bug 1509509.
+        if (_vm->_game.id == GID_INDY3 && _vm->_game.platform == Common::kPlatformMacintosh && _color == 0)
+                ignoreCharsetMask = false;
+
         // Indy3 / Zak256 / Loom
         int width, height, origWidth = 0, origHeight;
         VirtScreen *vs;

string.cpp

@@ -856 +856 @@
         _charset->_disableOffsX = _charset->_firstChar = true;
         _charset->setCurID(_string[a].charset);
 
+        // HACK: Correct positions of text in the grail diary in Indy3 Mac
+        if (_game.id == GID_INDY3 && _game.platform == Common::kPlatformMacintosh && a == 1) {
+                if (_currentRoom == 75) {
+                        if (_charset->_startLeft < 160)
+                                _charset->_startLeft = _charset->_left = _string[a].xpos - 22;
+                        else if (_charset->_startLeft < 200)
+                                _charset->_startLeft = _charset->_left = _string[a].xpos - 10;
+                } else if (_currentRoom == 69) {
+                        if (_charset->_startLeft < 160)
+                                _charset->_startLeft = _charset->_left = _string[a].xpos - 15;
+                        else if (_charset->_startLeft < 200)
+                                _charset->_startLeft = _charset->_left = _string[a].xpos - 10;
+                } else if (_currentRoom == 90) {
+                        if (_charset->_startLeft < 160)
+                                _charset->_startLeft = _charset->_left = _string[a].xpos - 21;
+                        else if (_charset->_startLeft < 200)
+                                _charset->_startLeft = _charset->_left = _string[a].xpos - 15;
+                }
+        }
+
         if (_game.version >= 5)
                 memcpy(_charsetColorMap, _charsetData[_charset->getCurID()], 4);