mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-09 19:32:11 +00:00
SCUMM: Some fixes for removing text
Drawing boxes and restoring verb backgrounds now also clears the text surface in Macintosh Loom.
This commit is contained in:
parent
5c0c64bc5a
commit
ec6f0b1cf3
@ -1151,6 +1151,11 @@ void ScummEngine::restoreBackground(Common::Rect rect, byte backColor) {
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
if (_macScreen) {
|
||||||
|
byte *mask = (byte *)_textSurface.getBasePtr(rect.left * _textSurfaceMultiplier, (rect.top + vs->topline) * _textSurfaceMultiplier);
|
||||||
|
fill(mask, _textSurface.pitch, CHARSET_MASK_TRANSPARENCY, width * _textSurfaceMultiplier, height * _textSurfaceMultiplier, _textSurface.format.bytesPerPixel);
|
||||||
|
}
|
||||||
|
|
||||||
if (_game.features & GF_16BIT_COLOR)
|
if (_game.features & GF_16BIT_COLOR)
|
||||||
fill(screenBuf, vs->pitch, _16BitPalette[backColor], width, height, vs->format.bytesPerPixel);
|
fill(screenBuf, vs->pitch, _16BitPalette[backColor], width, height, vs->format.bytesPerPixel);
|
||||||
else
|
else
|
||||||
@ -1450,6 +1455,11 @@ void ScummEngine::drawBox(int x, int y, int x2, int y2, int color) {
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
if (_macScreen) {
|
||||||
|
byte *mask = (byte *)_textSurface.getBasePtr(x * _textSurfaceMultiplier, (y - _screenTop + vs->topline) * _textSurfaceMultiplier);
|
||||||
|
fill(mask, _textSurface.pitch, CHARSET_MASK_TRANSPARENCY, width * _textSurfaceMultiplier, height * _textSurfaceMultiplier, _textSurface.format.bytesPerPixel);
|
||||||
|
}
|
||||||
|
|
||||||
fill(backbuff, vs->pitch, color, width, height, vs->format.bytesPerPixel);
|
fill(backbuff, vs->pitch, color, width, height, vs->format.bytesPerPixel);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user