mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(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)

This commit is contained in:
peter1138 2006-11-24 20:47:29 +00:00
parent c079c83eb6
commit 1955d1acd6
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx.c
View File

@ -1613,9 +1613,6 @@ void LoadStringWidthTable(void)
{ {
uint i; uint i;
/* Initialize the unicode to sprite mapping table */
InitializeUnicodeGlyphMap();
/* Normal font */ /* Normal font */
for (i = 0; i != 224; i++) { for (i = 0; i != 224; i++) {
_stringwidth_table[FS_NORMAL][i] = GetGlyphWidth(FS_NORMAL, i + 32); _stringwidth_table[FS_NORMAL][i] = GetGlyphWidth(FS_NORMAL, i + 32);

4
gfxinit.c
View File

@ -13,6 +13,7 @@
#include "newgrf.h" #include "newgrf.h"
#include "md5.h" #include "md5.h"
#include "variables.h" #include "variables.h"
#include "fontcache.h"
#include <string.h> #include <string.h>
typedef struct MD5File { typedef struct MD5File {
@ -372,6 +373,9 @@ static void LoadSpriteTables(void)
assert(load_index == SPR_AIRPORTX_BASE); assert(load_index == SPR_AIRPORTX_BASE);
load_index += LoadGrfFile("airports.grf", load_index, i++); load_index += LoadGrfFile("airports.grf", load_index, i++);
/* Initialize the unicode to sprite mapping table */
InitializeUnicodeGlyphMap();
LoadNewGRF(load_index, i); LoadNewGRF(load_index, i);
} }