diff options
| author | Colin Snover | 2017-01-07 10:47:17 -0600 |
|---|---|---|
| committer | Colin Snover | 2017-03-30 19:46:27 -0500 |
| commit | 4c942758c073ac007f8eefc819bcf7e2ac58557c (patch) | |
| tree | 2961a6325426f1210475b5850857eba91622a440 /engines/sci/graphics/text32.cpp | |
| parent | ceacf7df12edbdce058f9124ea3639a490fd824b (diff) | |
| download | scummvm-rg350-4c942758c073ac007f8eefc819bcf7e2ac58557c.tar.gz scummvm-rg350-4c942758c073ac007f8eefc819bcf7e2ac58557c.tar.bz2 scummvm-rg350-4c942758c073ac007f8eefc819bcf7e2ac58557c.zip | |
SCI32: Use built-in system font as default font for GfxText32
Fixes the non-interactive Lighthouse demo.
Diffstat (limited to 'engines/sci/graphics/text32.cpp')
| -rw-r--r-- | engines/sci/graphics/text32.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/sci/graphics/text32.cpp b/engines/sci/graphics/text32.cpp index 181dabc9a8..c6360010d3 100644 --- a/engines/sci/graphics/text32.cpp +++ b/engines/sci/graphics/text32.cpp @@ -38,7 +38,6 @@ namespace Sci { -int16 GfxText32::_defaultFontId = 0; int16 GfxText32::_xResolution = 0; int16 GfxText32::_yResolution = 0; @@ -49,8 +48,8 @@ GfxText32::GfxText32(SegManager *segMan, GfxCache *fonts) : _width(0), _text(""), _bitmap(NULL_REG) { - _fontId = _defaultFontId; - _font = _cache->getFont(_defaultFontId); + _fontId = kSci32SystemFont; + _font = _cache->getFont(kSci32SystemFont); if (_xResolution == 0) { // initialize the statics @@ -170,7 +169,7 @@ void GfxText32::setFont(const GuiResourceId fontId) { // table is built on the FontMgr directly; instead, because we already have // font resources, this code just grabs a font out of GfxCache. if (fontId != _fontId) { - _fontId = fontId == -1 ? _defaultFontId : fontId; + _fontId = fontId; _font = _cache->getFont(_fontId); } } |