Skip to content

Commit

Permalink
Text: Use arx_base.ttf
Browse files Browse the repository at this point in the history
This is new in AF 1.22 and is the same as arx_russian.ttf included
in 1.21.

arx_base.ttf has cyrillic glypths in positions where they should not
be which breaks things for French so only use it as a fallback.

For the Russian version, arx_russian.ttf is preferred anyway.
  • Loading branch information
dscharrer committed Jul 5, 2020
1 parent 3522075 commit c3d410b
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions src/gui/Text.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,11 @@ static bool getFontFile(res::path & result) {
return true;
}

result = "misc/arx_base.ttf";
if(g_resources->hasFile(result)) {
return true;
}

if(!config.language.empty()) {
LogCritical << "Missing font file: need either misc/arx_" << config.language
<< ".ttf, misc/arx_default.ttf or misc/arx.ttf.";
Expand Down

0 comments on commit c3d410b

Please sign in to comment.