Mercurial > hg > openttd
changeset 5156:5846f3283d44 draft
(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)
| author | peter1138 <peter1138@openttd.org> |
|---|---|
| date | Fri, 24 Nov 2006 20:47:29 +0000 |
| parents | 01253906aed6 |
| children | 75607e133b08 |
| files | gfx.c gfxinit.c |
| diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/gfx.c +++ b/gfx.c @@ -1613,9 +1613,6 @@ { 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);
--- 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 @@ 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); }