diff --git a/rts/Rendering/Fonts/CFontTexture.cpp b/rts/Rendering/Fonts/CFontTexture.cpp index 859c1d24d5..d83323bba5 100644 --- a/rts/Rendering/Fonts/CFontTexture.cpp +++ b/rts/Rendering/Fonts/CFontTexture.cpp @@ -91,7 +91,7 @@ class FtLibraryHandler { , lib(nullptr) #ifdef USE_FONTCONFIG , gameFontSet(nullptr) - , fallbackPattern(nullptr) + , basePattern(nullptr) #endif // USE_FONTCONFIG { const FT_Error error = FT_Init_FreeType(&lib); @@ -117,8 +117,8 @@ class FtLibraryHandler { if (gameFontSet) { FcFontSetDestroy(gameFontSet); } - if (fallbackPattern) { - FcPatternDestroy(fallbackPattern); + if (basePattern) { + FcPatternDestroy(basePattern); } FcFini(); config = nullptr; @@ -209,7 +209,7 @@ class FtLibraryHandler { } gameFontSet = FcFontSetCreate(); - fallbackPattern = FcPatternCreate(); + basePattern = FcPatternCreate(); // init app fonts dir res = FcConfigAppFontAddDir(config, reinterpret_cast("fonts")); @@ -270,16 +270,16 @@ class FtLibraryHandler { static FcFontSet *GetGameFontSet() { return singleton->gameFontSet; } - static FcPattern *GetFallbackPattern() { - return singleton->fallbackPattern; + static FcPattern *GetBasePattern() { + return singleton->basePattern; } static void ClearGameFontSet() { FcFontSetDestroy(singleton->gameFontSet); singleton->gameFontSet = FcFontSetCreate(); } - static void ClearFallbackPattern() { - FcPatternDestroy(singleton->fallbackPattern); - singleton->fallbackPattern = FcPatternCreate(); + static void ClearBasePattern() { + FcPatternDestroy(singleton->basePattern); + singleton->basePattern = FcPatternCreate(); } #endif private: @@ -287,7 +287,7 @@ class FtLibraryHandler { FT_Library lib; #ifdef USE_FONTCONFIG FcFontSet *gameFontSet; - FcPattern *fallbackPattern; + FcPattern *basePattern; #endif static inline std::unique_ptr singleton = nullptr; @@ -450,7 +450,7 @@ static std::shared_ptr GetFontForCharacters(const std::vector