diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/kyra/screen.cpp | 6 | ||||
-rw-r--r-- | engines/scumm/charset.cpp | 19 |
2 files changed, 13 insertions, 12 deletions
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp index f08fb4e7ef..8b0a87f0c8 100644 --- a/engines/kyra/screen.cpp +++ b/engines/kyra/screen.cpp @@ -3313,7 +3313,7 @@ SJISFont::SJISFont(Screen *s, Graphics::FontSJIS *font, const uint8 invisColor, : _colorMap(0), _font(font), _invisColor(invisColor), _is16Color(is16Color), _screen(s) { assert(_font); - _font->setShadowMode(outlineSize ? Graphics::FontSJIS::kShadowTypeOutline : Graphics::FontSJIS::kShadowTypeNone); + _font->setDrawingMode(outlineSize ? Graphics::FontSJIS::kOutlineMode : Graphics::FontSJIS::kDefaultMode); _sjisWidth = _font->getMaxFontWidth() >> 1; _fontHeight = _font->getFontHeight() >> 1; @@ -3345,9 +3345,9 @@ void SJISFont::setColorMap(const uint8 *src) { if (!_is16Color) { if (_colorMap[0] == _invisColor) - _font->setShadowMode(Graphics::FontSJIS::kShadowTypeNone); + _font->setDrawingMode(Graphics::FontSJIS::kDefaultMode); else - _font->setShadowMode(Graphics::FontSJIS::kShadowTypeOutline); + _font->setDrawingMode(Graphics::FontSJIS::kOutlineMode); } } diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp index c77c77857a..207aa2c754 100644 --- a/engines/scumm/charset.cpp +++ b/engines/scumm/charset.cpp @@ -666,15 +666,16 @@ void CharsetRendererCommon::enableShadow(bool enable) { _shadowColor = _vm->_game.version == 5 ? _vm->_townsCharsetColorMap[0] : 0x88; if (_vm->_cjkFont) { if (_vm->_game.version == 5) { - if (_vm->_game.id == GID_MONKEY) { - _vm->_cjkFont->setShadowMode((_curId == 2 || _curId == 4 || _curId == 6) ? Graphics::FontSJIS::kShadowTypeOutline : Graphics::FontSJIS::kShadowTypeNone); - } else if (_vm->_game.id == GID_MONKEY2) { - _vm->_cjkFont->setShadowMode((_curId != 1 && _curId != 5 && _curId != 9) ? Graphics::FontSJIS::kShadowTypeOutline : Graphics::FontSJIS::kShadowTypeNone); - } else if (_vm->_game.id == GID_INDY4) { - _vm->_cjkFont->setShadowMode((_curId == 2 || _curId == 3 || _curId == 4) ? Graphics::FontSJIS::kShadowTypeOutline : Graphics::FontSJIS::kShadowTypeNone); - } + if (((_vm->_game.id == GID_MONKEY) && (_curId == 2 || _curId == 4 || _curId == 6)) || + ((_vm->_game.id == GID_MONKEY2) && (_curId != 1 && _curId != 5 && _curId != 9)) || + ((_vm->_game.id == GID_INDY4) && (_curId == 2 || _curId == 3 || _curId == 4))) { + _vm->_cjkFont->setDrawingMode(Graphics::FontSJIS::kOutlineMode); + } else { + _vm->_cjkFont->setDrawingMode(Graphics::FontSJIS::kDefaultMode); + } + _vm->_cjkFont->toggleFlippedMode((_vm->_game.id == GID_MONKEY || _vm->_game.id == GID_MONKEY2) && _curId == 3); } else { - _vm->_cjkFont->setShadowMode(Graphics::FontSJIS::kShadowTypeScumm3Towns); + _vm->_cjkFont->setDrawingMode(Graphics::FontSJIS::kShadowMode); } } #endif @@ -685,7 +686,7 @@ void CharsetRendererCommon::enableShadow(bool enable) { } } else { if (_vm->_cjkFont) - _vm->_cjkFont->setShadowMode(Graphics::FontSJIS::kShadowTypeNone); + _vm->_cjkFont->setDrawingMode(Graphics::FontSJIS::kDefaultMode); _shadowMode = kNoShadowMode; } } |