WAGE/GRAPHICS: Move standard Mac font mapping to gui/

1 files changed, 7 insertions, 48 deletions

diff --git a/engines/wage/entities.cpp b/engines/wage/entities.cpp
index 28a708b0c3..77ab2659af 100644
--- a/engines/wage/entities.cpp
+++ b/engines/wage/entities.cpp
@@ -48,6 +48,7 @@
 #include "wage/wage.h"
 #include "wage/entities.h"
 #include "wage/design.h"
+#include "wage/gui.h"
 #include "wage/script.h"
 #include "wage/world.h"
 
@@ -156,55 +157,13 @@ void Scene::paint(Graphics::ManagedSurface *surface, int x, int y) {
 	}
 }
 
-// Source: Apple IIGS Technical Note #41, "Font Family Numbers"
-// http://apple2.boldt.ca/?page=til/tn.iigs.041
-static const char *const fontNames[] = {
-	"Chicago",	// system font
-	"Geneva",	// application font
-	"New York",
-	"Geneva",
-
-	"Monaco",
-	"Venice",
-	"London",
-	"Athens",
-
-	"San Francisco",
-	"Toronto",
-	NULL,
-	"Cairo",
-	"Los Angeles", // 12
-
-	"Zapf Dingbats",
-	"Bookman",
-	"Helvetica Narrow",
-	"Palatino",
-	NULL,
-	"Zapf Chancery",
-	NULL,
-
-	"Times", // 20
-	"Helvetica",
-	"Courier",
-	"Symbol",
-	"Taliesin", // mobile?
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL, // 30
-	NULL,
-	NULL,
-	"Avant Garde",
-	"New Century Schoolbook"
-};
-
 const char *Scene::getFontName() {
-	if (_fontType >= 0 && _fontType < ARRAYSIZE(fontNames) && fontNames[_fontType] != NULL) {
-		return fontNames[_fontType];
-	}
-	return "Unknown";
+	const char *name = ((WageEngine *)g_engine)->_gui->_wm.getFontName(_fontType);
+
+	if (!name)
+		return "Unknown";
+
+	return name;
 }
 
 Designed *Scene::lookUpEntity(int x, int y) {