Use proper font, even when different language is selected

SuperTux · Aug 25, 2023 · 825985a · 825985a
1 parent a629e7a
commit 825985a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/supertux/menu/language_menu.cpp b/src/supertux/menu/language_menu.cpp
@@ -49,12 +49,13 @@ LanguageMenu::LanguageMenu()
   for (auto& lang : languages)
   {
     auto& item = add_entry(mnid++, lang.get_localized_name());
+    auto font = Resources::default_font;
     if(Resources::needs_custom_font(lang))
     {
       auto font_path = Resources::get_font_for_locale(lang);
-      auto font = std::make_shared<TTFFont>(font_path, 18, 1.25f, 2, 1);
-      item.set_font(font);
+      font = std::make_shared<TTFFont>(font_path, 18, 1.25f, 2, 1);
     }
+    item.set_font(font);
   }
 
   add_hl();

diff --git a/src/supertux/resources.cpp b/src/supertux/resources.cpp
@@ -30,6 +30,7 @@
 
 std::unique_ptr<MouseCursor> Resources::mouse_cursor;
 
+FontPtr Resources::default_font;
 FontPtr Resources::console_font;
 FontPtr Resources::fixed_font;
 FontPtr Resources::normal_font;
@@ -53,6 +54,7 @@ Resources::load()
   mouse_cursor.reset(new MouseCursor(SpriteManager::current()->create("images/engine/menu/mousecursor.sprite")));
   MouseCursor::set_current(mouse_cursor.get());
 
+  default_font.reset(new TTFFont("fonts/SuperTux-Medium.ttf", 18, 1.25f, 2, 1));
   if (g_debug.get_use_bitmap_fonts())
   {
     console_font.reset(new BitmapFont(BitmapFont::FIXED, "fonts/andale12.stf", 1));

diff --git a/src/supertux/resources.hpp b/src/supertux/resources.hpp
@@ -32,6 +32,9 @@ class Resources final
 public:
   static std::unique_ptr<MouseCursor> mouse_cursor;
 
+  /** Font that can display English glyphs */
+  static FontPtr default_font;
+
   /** Font used in the console */
   static FontPtr console_font;