(svn r7254) -Fix (r7250): move unicode glyph map initialisation to just before newgrf files are loaded, else newgrf glyphs will be cleared out too. (thanks Hadez)

2 files changed, 4 insertions, 3 deletions

diff --git a/gfx.c b/gfx.c
index 41c072d62..314de65d7 100644
--- a/gfx.c
+++ b/gfx.c
@@ -1613,9 +1613,6 @@ void LoadStringWidthTable(void)
 {
 	uint i;
 
-	/* Initialize the unicode to sprite mapping table */
-	InitializeUnicodeGlyphMap();
-
 	/* Normal font */
 	for (i = 0; i != 224; i++) {
 		_stringwidth_table[FS_NORMAL][i] = GetGlyphWidth(FS_NORMAL, i + 32);
diff --git a/gfxinit.c b/gfxinit.c
index 5b88eaf3f..bc4e3bb4f 100644
--- a/gfxinit.c
+++ b/gfxinit.c
@@ -13,6 +13,7 @@
 #include "newgrf.h"
 #include "md5.h"
 #include "variables.h"
+#include "fontcache.h"
 #include <string.h>
 
 typedef struct MD5File {
@@ -372,6 +373,9 @@ static void LoadSpriteTables(void)
 	assert(load_index == SPR_AIRPORTX_BASE);
 	load_index += LoadGrfFile("airports.grf", load_index, i++);
 
+	/* Initialize the unicode to sprite mapping table */
+	InitializeUnicodeGlyphMap();
+
 	LoadNewGRF(load_index, i);
 }