SCUMM: Simplified Mac font rendering

Instead of trying to keep track of the real Mac screen coordinates in
the _charset data type, use the original 320x200 coordinates and only
scale up at the time of rendering.

Either way, the output is not pixel perfect, and this is much less error
prone.

Now if only text removal worked correctly...
This commit is contained in:
Torbjörn Andersson 2021-05-15 16:06:11 +02:00 committed by Eugene Sandulenko
parent 5b70ddd802
commit 27420f78d4
4 changed files with 20 additions and 48 deletions

View file

@ -652,12 +652,6 @@ void ScummEngine::CHARSET_1() {
_charset->_center = _string[0].center;
_charset->setColor(_charsetColor);
if (_macScreen) {
_charset->_top *= 2;
_charset->_startLeft *= 2;
_charset->_left *= 2;
}
if (a && a->_charset)
_charset->setCurID(a->_charset);
else
@ -1028,12 +1022,6 @@ void ScummEngine::drawString(int a, const byte *msg) {
_charset->_disableOffsX = _charset->_firstChar = true;
_charset->setCurID(_string[a].charset);
if (_macScreen) {
_charset->_top *= 2;
_charset->_startLeft *= 2;
_charset->_left *= 2;
}
// HACK: Correct positions of text in books in Indy3 Mac.
// See also bug #8759.
if (_game.id == GID_INDY3 && _game.platform == Common::kPlatformMacintosh && a == 1) {