Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-04 06:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r23283) -Fix: [NewGRF] Prevent against writing data for unknown fonts

Browse Source
This commit is contained in:
rubidium 2011-11-20 15:17:34 +00:00
parent 0e28c6665e
commit a799efbbb2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/newgrf.cpp
View File

@ -6886,7 +6886,7 @@ static void LoadFontGlyph(ByteReader *buf)
/* <12> <num_def> <font_size> <num_char> <base_char>
*
* B num_def Number of definitions
* B font_size Size of font (0 = normal, 1 = small, 2 = large)
* B font_size Size of font (0 = normal, 1 = small, 2 = large, 3 = mono)
* B num_char Number of consecutive glyphs
* W base_char First character index */
@ -6897,10 +6897,14 @@ static void LoadFontGlyph(ByteReader *buf)
uint8 num_char = buf->ReadByte();
uint16 base_char = buf->ReadWord();
if (size >= FS_END) {
grfmsg(1, "LoadFontGlyph: Size %u is not supported, ignoring", size);
}
grfmsg(7, "LoadFontGlyph: Loading %u glyph(s) at 0x%04X for size %u", num_char, base_char, size);
for (uint c = 0; c < num_char; c++) {
SetUnicodeGlyph(size, base_char + c, _cur.spriteid);
if (size < FS_END) SetUnicodeGlyph(size, base_char + c, _cur.spriteid);
_cur.nfo_line++;
LoadNextSprite(_cur.spriteid++, _cur.file_index, _cur.nfo_line);
}