mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r21321) -Fix (r21298): use the correct font sizes when checking for missing glyphs

release/1.1
glx 2010-11-25 15:20:10 +00:00
parent 4e78e7b6c2
commit 02d63f45e2
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/strings.cpp
View File

@ -1576,9 +1576,16 @@ static bool FindMissingGlyphs(const char **str)
UninitFreeType(); UninitFreeType();
InitFreeType(); InitFreeType();
#endif #endif
const Sprite *question_mark = GetGlyph(FS_NORMAL, '?'); const Sprite *question_mark[FS_END];
FontSize size;
for (size = FS_BEGIN; size < FS_END; size++) {
question_mark[size] = GetGlyph(size, '?');
}
for (uint i = 0; i != 32; i++) { for (uint i = 0; i != 32; i++) {
for (uint j = 0; j < _langtab_num[i]; j++) { for (uint j = 0; j < _langtab_num[i]; j++) {
size = FS_NORMAL;
const char *text = _langpack_offs[_langtab_start[i] + j]; const char *text = _langpack_offs[_langtab_start[i] + j];
if (str != NULL) *str = text; if (str != NULL) *str = text;
for (WChar c = Utf8Consume(&text); c != '\0'; c = Utf8Consume(&text)) { for (WChar c = Utf8Consume(&text); c != '\0'; c = Utf8Consume(&text)) {
@ -1589,7 +1596,11 @@ static bool FindMissingGlyphs(const char **str)
text++; text++;
} else if (c == SCC_SETXY) { } else if (c == SCC_SETXY) {
text += 2; text += 2;
} else if (IsPrintable(c) && !IsTextDirectionChar(c) && c != '?' && GetGlyph(FS_NORMAL, c) == question_mark) { } else if (c == SCC_TINYFONT) {
size = FS_SMALL;
} else if (c == SCC_BIGFONT) {
size = FS_LARGE;
} else if (IsPrintable(c) && !IsTextDirectionChar(c) && c != '?' && GetGlyph(size, c) == question_mark[size]) {
/* The character is printable, but not in the normal font. This is the case we were testing for. */ /* The character is printable, but not in the normal font. This is the case we were testing for. */
return true; return true;
} }