Fix font loading (#37919)

* Remove Terminus-Bold font It has same internal id as normal Terminus font which can cause confusion. * Avoid adding file extension to typeface multiple times
CleverRaven · Feb 17, 2020 · 9aa8765 · 9aa8765
1 parent bd6534a
commit 9aa8765
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/data/font/terminus-bold.fon b/data/font/terminus-bold.fon
diff --git a/src/sdltiles.cpp b/src/sdltiles.cpp
@@ -3865,20 +3865,21 @@ CachedTTFFont::CachedTTFFont( const int w, const int h, std::string typeface, in
     : Font( w, h )
     , fontblending( fontblending )
 {
+    const std::string original_typeface = typeface;
     int faceIndex = 0;
     if( const cata::optional<std::string> sysfnt = find_system_font( typeface, faceIndex ) ) {
         typeface = *sysfnt;
         dbg( D_INFO ) << "Using font [" + typeface + "] found in the system.";
     }
     if( !file_exist( typeface ) ) {
         faceIndex = 0;
-        typeface = PATH_INFO::user_font() + typeface + ".ttf";
+        typeface = PATH_INFO::user_font() + original_typeface + ".ttf";
         dbg( D_INFO ) << "Using compatible font [" + typeface + "] found in user font dir.";
     }
     //make fontdata compatible with wincurse
     if( !file_exist( typeface ) ) {
         faceIndex = 0;
-        typeface = PATH_INFO::fontdir() + typeface + ".ttf";
+        typeface = PATH_INFO::fontdir() + original_typeface + ".ttf";
         dbg( D_INFO ) << "Using compatible font [" + typeface + "] found in font dir.";
     }
     //different default font with wincurse