From f2584488aab4073642ddbf35c50ea8e46bd43a55 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Thu, 7 Jan 2016 12:14:07 +0100
Subject: WAGE: Fixed font mapping

---
 engines/wage/entities.cpp | 21 +++++++++++++++++++--
 engines/wage/world.cpp    |  2 +-
 2 files changed, 20 insertions(+), 3 deletions(-)

(limited to 'engines/wage')

diff --git a/engines/wage/entities.cpp b/engines/wage/entities.cpp
index dbf156fbba..f24eea2673 100644
--- a/engines/wage/entities.cpp
+++ b/engines/wage/entities.cpp
@@ -164,16 +164,33 @@ const char *fontNames[] = {
 
 	"San Francisco",
 	"Toronto",
+	NULL,
 	"Cairo",
 	"Los Angeles", // 12
 
-	NULL, NULL, NULL, NULL, NULL, NULL, NULL, // not in Inside Macintosh
+	"Zapf Dingbats",
+	"Bookman",
+	"Helvetica Narrow",
+	"Palatino",
+	NULL,
+	"Zapf Chancery",
+	NULL,
 
 	"Times", // 20
 	"Helvetica",
 	"Courier",
 	"Symbol",
-	"Taliesin" // mobile?
+	"Taliesin", // mobile?
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL, // 30
+	NULL,
+	NULL,
+	"Avant Garde",
+	"New Century Schoolbook"
 };
 
 const char *Scene::getFontName() {
diff --git a/engines/wage/world.cpp b/engines/wage/world.cpp
index 188754534c..22a7bc9b4b 100644
--- a/engines/wage/world.cpp
+++ b/engines/wage/world.cpp
@@ -182,7 +182,7 @@ bool World::loadWorld(Common::MacResManager *resMan) {
 			scene->_fontSize = res->readUint16BE();
 
 			if (scene->_fontType != 3 || scene->_fontSize != 9)
-				warning("scene: %s font: %s size: %d", scene->_name.c_str(), scene->getFontName(), scene->_fontSize);
+				warning("scene: %s font: '%s' (%d) size: %d", scene->_name.c_str(), scene->getFontName(), scene->_fontType, scene->_fontSize);
 
 			String text;
 			while (res->pos() < res->size()) {
-- 
cgit v1.2.3