Ticket #8137: insult-arrows.diff

scummvm/scumm/scumm.h

@@ -194 +194 @@
         bool _blitAlso;
         
         int _strLeft, _strRight, _strTop, _strBottom;
+        int _strLeftPixel, _strRightPixel;
         byte _curId;
 
         int _xpos2, _ypos2;

scummvm/scumm/string.cpp

@@ -588 +588 @@
         charset._unk12 = 1;
         charset._disableOffsX = 1;
 
+        // In MonkeyVGA, the scroll arrows during insult sword-fighting are
+        // drawn - correctly, as far as I can tell - so that their background
+        // overlaps the insults/comebacks. This causes problems whenever the
+        // arrows are redrawn, because ScummVM simply erases the whole area
+        // it thinks the verb occupies.
+        //
+        // To fix this, keep track of the left- and rightmost pixels of the
+        // string that are actually drawn. I originally intended to do the
+        // same for top and bottom, but for whatever reason I could never get
+        // it to work right. Besides, I've never seen any case where it would
+        // be necessary anyway.
+
+        charset._strLeftPixel = _realWidth;
+        charset._strRightPixel = -1;
+
         if (!(_features & GF_OLD256)) {
                 charsetptr = getResourceAddress(rtCharset, charset._curId);
                 assert(charsetptr);
@@ -703 +718 @@
                 if (charset._strBottom > gdi._mask_bottom)
                         gdi._mask_bottom = charset._strBottom;
         } 
+
+        // If the string has no pixels (which at the very least happens in
+        // Indy3), then fall back on _strLeft and _strRight.
+
+        if (charset._strLeftPixel == _realWidth)
+                charset._strLeftPixel = charset._strLeft;
+        if (charset._strRightPixel == -1)
+                charset._strRightPixel = charset._strRight;
 }
 
 byte *Scumm::addMessageToStack(byte *msg)
@@ -1089 +1112 @@
                                         mask[maskpos] |= maskmask;
                                 }
                                 *dst = _colorMap[color];
+                                if (_left + x < _strLeftPixel)
+                                        _strLeftPixel = _left + x;
+                                if (_left + x > _strRightPixel)
+                                        _strRightPixel = _left + x;
                         }
                         dst++;
                         bits <<= _bpp;

scummvm/scumm/verbs.cpp

@@ -160 +160 @@
                 drawString(4);
                 charset._center = tmp;
 
-                vs->right = charset._strRight;
+                vs->right = charset._strRightPixel;
                 vs->bottom = charset._strBottom;
-                vs->oldleft = charset._strLeft;
-                vs->oldright = charset._strRight;
+                vs->oldleft = charset._strLeftPixel;
+                vs->oldright = charset._strRightPixel;
                 vs->oldtop = charset._strTop;
                 vs->oldbottom = charset._strBottom;
                 charset._strLeft = charset._strRight;