aboutsummaryrefslogtreecommitdiff
path: root/graphics/macgui/macfontmanager.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2016-10-12 23:27:50 +0200
committerEugene Sandulenko2016-10-12 23:27:50 +0200
commitce89406b9a7e68acefae307281dc98e97a7bca88 (patch)
treed6d2315b2cd65f0ea43eab8978610631333cc436 /graphics/macgui/macfontmanager.cpp
parentb5d4c302d0661fe1bfd5144a5eab4d1e3b02ffab (diff)
downloadscummvm-rg350-ce89406b9a7e68acefae307281dc98e97a7bca88.tar.gz
scummvm-rg350-ce89406b9a7e68acefae307281dc98e97a7bca88.tar.bz2
scummvm-rg350-ce89406b9a7e68acefae307281dc98e97a7bca88.zip
GRAPHICS: Fix BDF font referencing on font generation
Diffstat (limited to 'graphics/macgui/macfontmanager.cpp')
-rw-r--r--graphics/macgui/macfontmanager.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/graphics/macgui/macfontmanager.cpp b/graphics/macgui/macfontmanager.cpp
index 52e82584c7..21f9c08160 100644
--- a/graphics/macgui/macfontmanager.cpp
+++ b/graphics/macgui/macfontmanager.cpp
@@ -257,15 +257,19 @@ void MacFontManager::generateFontSubstitute(MacFont &macFont) {
}
// Now next smaller font, which is the biggest we have
- generateFont(macFont, MacFont(macFont.getId(), maxSize, macFont.getSlant()));
+ generateFont(macFont, *_fontRegistry[getFontName(macFont.getId(), maxSize, macFont.getSlant())]);
}
-void MacFontManager::generateFont(MacFont toFont, MacFont fromFont) {
+void MacFontManager::generateFont(MacFont &toFont, MacFont &fromFont) {
debugN("Found font substitute for font '%s' ", getFontName(toFont));
debug("as '%s'", getFontName(fromFont));
Graphics::BdfFont *font = Graphics::BdfFont::scaleFont(fromFont.getBdfFont(), toFont.getSize());
+ if (!font) {
+ warning("Failed to generate font '%s'", getFontName(toFont));
+ }
+
toFont.setGenerated(true);
toFont.setBdfFont(font);