diff options
| author | Vincent Bénony | 2016-01-06 16:20:23 +0100 |
|---|---|---|
| committer | Vincent Bénony | 2016-01-06 16:20:23 +0100 |
| commit | efdb5679ce6304dbc854afbbc511e633d7513338 (patch) | |
| tree | e680a240e5f6018fc3a4cce53b50060caa22a929 /engines/wintermute/base/font | |
| parent | 4687ff6d6d2863cc95c8137543ecf9c39bc01723 (diff) | |
| parent | b72c02bad44749a1355acefdb198e36b2e772575 (diff) | |
| download | scummvm-rg350-efdb5679ce6304dbc854afbbc511e633d7513338.tar.gz scummvm-rg350-efdb5679ce6304dbc854afbbc511e633d7513338.tar.bz2 scummvm-rg350-efdb5679ce6304dbc854afbbc511e633d7513338.zip | |
IOS: Merge branch 'master' into ios-fix
Diffstat (limited to 'engines/wintermute/base/font')
| -rw-r--r-- | engines/wintermute/base/font/base_font_truetype.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp index f27b565a7f..fa6973c58f 100644 --- a/engines/wintermute/base/font/base_font_truetype.cpp +++ b/engines/wintermute/base/font/base_font_truetype.cpp @@ -581,7 +581,7 @@ bool BaseFontTT::initFont() { } if (file) { - _deletableFont = Graphics::loadTTFFont(*file, _fontHeight, 96); // Use the same dpi as WME (96 vs 72). + _deletableFont = Graphics::loadTTFFont(*file, _fontHeight, Graphics::kTTFSizeModeCharacter, 96); // Use the same dpi as WME (96 vs 72). _font = _deletableFont; BaseFileManager::getEngineInstance()->closeFile(file); file = nullptr; @@ -607,7 +607,7 @@ bool BaseFontTT::initFont() { if (themeArchive->hasFile(fallbackFilename)) { file = nullptr; file = themeArchive->createReadStreamForMember(fallbackFilename); - _deletableFont = Graphics::loadTTFFont(*file, _fontHeight, 96); // Use the same dpi as WME (96 vs 72). + _deletableFont = Graphics::loadTTFFont(*file, _fontHeight, Graphics::kTTFSizeModeCharacter, 96); // Use the same dpi as WME (96 vs 72). _font = _deletableFont; } // We're not using BaseFileManager, so clean up after ourselves: |