(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.

1 files changed, 10 insertions, 0 deletions

diff --git a/openttd.c b/openttd.c
index fceee47d2..0103c279d 100644
--- a/openttd.c
+++ b/openttd.c
@@ -52,6 +52,7 @@
 #include "genworld.h"
 #include "date.h"
 #include "clear_map.h"
+#include "fontcache.h"
 
 #include <stdarg.h>
 
@@ -432,10 +433,15 @@ int ttd_main(int argc, char *argv[])
 	MxInitialize(11025);
 	SoundInitialize("sample.cat");
 
+	/* Initialize FreeType */
+	InitFreeType();
+
 	// This must be done early, since functions use the InvalidateWindow* calls
 	InitWindowSystem();
 
 	GfxLoadSprites();
+	/* Initialize the unicode to sprite mapping table */
+	InitializeUnicodeGlyphMap();
 	LoadStringWidthTable();
 
 	DEBUG(driver, 1) ("Loading drivers...");
@@ -1526,5 +1532,9 @@ bool AfterLoadGame(void)
 		}
 	}
 
+	if (CheckSavegameVersion(37)) {
+		ConvertNameArray();
+	}
+
 	return true;
 }