From 0cccd0ddd1d53b7d16e47a5b2d8ca62c87d992f4 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Wed, 3 Aug 2016 23:39:10 +0200
Subject: GRAPHICS/WAGE: Made MacWindowManager font maping requiring font size

---
 engines/wage/dialog.cpp      | 2 +-
 engines/wage/entities.cpp    | 2 +-
 engines/wage/gui-console.cpp | 5 +----
 3 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'engines/wage')

diff --git a/engines/wage/dialog.cpp b/engines/wage/dialog.cpp
index a2013db852..0a326817be 100644
--- a/engines/wage/dialog.cpp
+++ b/engines/wage/dialog.cpp
@@ -92,7 +92,7 @@ Dialog::~Dialog() {
 }
 
 const Graphics::Font *Dialog::getDialogFont() {
-	return _gui->_wm.getFont("Chicago-12", Graphics::FontManager::kBigGUIFont);
+	return _gui->_wm.getFont(_gui->_wm.getFontName(0, 12), Graphics::FontManager::kBigGUIFont); // Default is Chicago
 }
 
 void Dialog::paint() {
diff --git a/engines/wage/entities.cpp b/engines/wage/entities.cpp
index 77ab2659af..3dcf37033a 100644
--- a/engines/wage/entities.cpp
+++ b/engines/wage/entities.cpp
@@ -158,7 +158,7 @@ void Scene::paint(Graphics::ManagedSurface *surface, int x, int y) {
 }
 
 const char *Scene::getFontName() {
-	const char *name = ((WageEngine *)g_engine)->_gui->_wm.getFontName(_fontType);
+	const char *name = ((WageEngine *)g_engine)->_gui->_wm.getFontName(_fontType, _fontSize);
 
 	if (!name)
 		return "Unknown";
diff --git a/engines/wage/gui-console.cpp b/engines/wage/gui-console.cpp
index 1cf98ab991..2b364d3657 100644
--- a/engines/wage/gui-console.cpp
+++ b/engines/wage/gui-console.cpp
@@ -63,12 +63,9 @@
 namespace Wage {
 
 const Graphics::Font *Gui::getConsoleFont() {
-	char fontName[128];
 	Scene *scene = _engine->_world->_player->_currentScene;
 
-	snprintf(fontName, 128, "%s-%d", scene->getFontName(), scene->_fontSize);
-
-	return _wm.getFont(fontName, Graphics::FontManager::kConsoleFont);
+	return _wm.getFont(scene->getFontName(), Graphics::FontManager::kConsoleFont);
 }
 
 void Gui::clearOutput() {
-- 
cgit v1.2.3