From 797be02eb23a21a2a517cd80ccd220f7deac2ac4 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Wed, 25 Jan 2017 19:41:53 +0100 Subject: GRAPHICS: Fix MacFont association to MacFontFamily --- graphics/macgui/macfontmanager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'graphics/macgui') 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 *assoc = fontFamily.getAssocTable(); + Common::Array *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; -- cgit v1.2.3