diff options
| author | Eugene Sandulenko | 2017-01-25 19:41:53 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-01-25 19:41:53 +0100 |
| commit | 797be02eb23a21a2a517cd80ccd220f7deac2ac4 (patch) | |
| tree | 52d2d78355e5f95494b6dfa50c51440314ce1b41 | |
| parent | 8c854897fd033b328bb0e7c3ed2a3bef9da42ffd (diff) | |
| download | scummvm-rg350-797be02eb23a21a2a517cd80ccd220f7deac2ac4.tar.gz scummvm-rg350-797be02eb23a21a2a517cd80ccd220f7deac2ac4.tar.bz2 scummvm-rg350-797be02eb23a21a2a517cd80ccd220f7deac2ac4.zip | |
GRAPHICS: Fix MacFont association to MacFontFamily
| -rw-r--r-- | graphics/macgui/macfontmanager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/graphics/macgui/macfontmanager.cpp b/graphics/macgui/macfontmanager.cpp index 20417979ce..4c8b9eb06c 100644 --- a/graphics/macgui/macfontmanager.cpp +++ b/graphics/macgui/macfontmanager.cpp @@ -170,10 +170,10 @@ void MacFontManager::loadFonts() { Common::String familyName = fontFile->getResName(MKTAG('F', 'O', 'N', 'D'), *iterator); - Graphics::MacFontFamily fontFamily; - fontFamily.load(*fond); + Graphics::MacFontFamily *fontFamily = new MacFontFamily(); + fontFamily->load(*fond); - Common::Array<Graphics::MacFontFamily::AsscEntry> *assoc = fontFamily.getAssocTable(); + Common::Array<Graphics::MacFontFamily::AsscEntry> *assoc = fontFamily->getAssocTable(); for (uint i = 0; i < assoc->size(); i++) { debug("size: %d style: %d id: %d", (*assoc)[i]._fontSize, (*assoc)[i]._fontStyle, @@ -195,7 +195,7 @@ void MacFontManager::loadFonts() { } font = new Graphics::MacFONTFont; - font->loadFont(*fontstream); + font->loadFont(*fontstream, fontFamily, (*assoc)[i]._fontSize, (*assoc)[i]._fontStyle); delete fontstream; |