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

(svn r23273) -Codechange: allow passing a MissingGlyphSearcher to CheckForMissingGlyphs (default to the language pack strings)

This commit is contained in:
rubidium 2011-11-20 11:52:11 +00:00
parent 2075bc702c
commit 0a4a75b0af
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bootstrap_gui.cpp
View File

@ -234,7 +234,7 @@ bool HandleBootstrap()
/* Initialise the freetype font code. */
InitializeUnicodeGlyphMap();
/* Next "force" finding a suitable freetype font as the local font is missing. */
CheckForMissingGlyphsInLoadedLanguagePack(false);
CheckForMissingGlyphs(false);
/* Initialise the palette. The biggest step is 'faking' some recolour sprites.
* This way the mauve and gray colours work and we can show the user interface. */

4
src/openttd.cpp
View File

@ -334,7 +334,7 @@ static void LoadIntroGame(bool load_newgrfs = true)
_cursor.fix_at = false;
CheckForMissingSprites();
CheckForMissingGlyphsInLoadedLanguagePack();
CheckForMissingGlyphs();
/* Play main theme */
if (_music_driver->IsSongPlaying()) ResetMusic();
@ -810,7 +810,7 @@ int ttd_main(int argc, char *argv[])
LoadIntroGame(false);
CheckForMissingGlyphsInLoadedLanguagePack();
CheckForMissingGlyphs();
ScanNewGRFFiles(scanner);

2
src/settings_gui.cpp
View File

@ -495,7 +495,7 @@ struct GameOptionsWindow : Window {
case GOW_LANG_DROPDOWN: // Change interface language
ReadLanguagePack(&_languages[index]);
DeleteWindowByClass(WC_QUERY_STRING);
CheckForMissingGlyphsInLoadedLanguagePack();
CheckForMissingGlyphs();
UpdateAllVirtCoords();
ReInitAllWindows();
break;

11
src/strings.cpp
View File

@ -1833,11 +1833,14 @@ class LanguagePackGlyphSearcher : public MissingGlyphSearcher {
* font, which is the whole reason this check has
* been added.
* @param base_font Whether to look at the base font as well.
* @param searcher The methods to use to search for strings to check.
* If NULL the loaded language pack searcher is used.
*/
void CheckForMissingGlyphsInLoadedLanguagePack(bool base_font)
void CheckForMissingGlyphs(bool base_font, MissingGlyphSearcher *searcher)
{
LanguagePackGlyphSearcher searcher;
bool bad_font = !base_font || searcher.FindMissingGlyphs(NULL);
static LanguagePackGlyphSearcher pack_searcher;
if (searcher == NULL) searcher = &pack_searcher;
bool bad_font = !base_font || searcher->FindMissingGlyphs(NULL);
#ifdef WITH_FREETYPE
if (bad_font) {
/* We found an unprintable character... lets try whether we can find
@ -1845,7 +1848,7 @@ void CheckForMissingGlyphsInLoadedLanguagePack(bool base_font)
FreeTypeSettings backup;
memcpy(&backup, &_freetype, sizeof(backup));
bad_font = !SetFallbackFont(&_freetype, _langpack->isocode, _langpack->winlangid, &searcher);
bad_font = !SetFallbackFont(&_freetype, _langpack->isocode, _langpack->winlangid, searcher);
memcpy(&_freetype, &backup, sizeof(backup));

2
src/strings_func.h
View File

@ -232,6 +232,6 @@ public:
bool FindMissingGlyphs(const char **str);
};
void CheckForMissingGlyphsInLoadedLanguagePack(bool base_font = true);
void CheckForMissingGlyphs(bool base_font = true, MissingGlyphSearcher *search = NULL);
#endif /* STRINGS_FUNC_H */