WAGE: Fixed font mapping

scummvm · Jan 7, 2016 · f258448 · f258448
1 parent 46076a0
commit f258448
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git 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
@@ -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()) {