Rim/h2-mod
Rim/h2-mod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing csv + fixes

Browse Source
This commit is contained in:
fed 2023-03-03 19:25:35 +01:00
parent 945e502d82
commit 0e749ad8e3
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/zone_source/h2_mod_font_bank.csv Normal file
View File

@ -0,0 +1 @@
ttf,fonts/bank.ttf
1 ttf fonts/bank.ttf

16
src/client/component/fonts.cpp
View File

@ -164,11 +164,7 @@ namespace fonts
void load_font_zones() void load_font_zones()
{ {
const auto disabled = config::get<bool>("disable_custom_fonts"); const auto disabled = config::get<bool>("disable_custom_fonts");
if (disabled.has_value() && disabled.value() && language::current() != game::LANGUAGE_CZECH) const auto custom_fonts_disabled = disabled.has_value() && disabled.value() && !language::is_custom();
{
return;
}
const auto table = game::DB_FindXAssetHeader(game::ASSET_TYPE_STRINGTABLE, "font_zones.csv", 0).stringTable; const auto table = game::DB_FindXAssetHeader(game::ASSET_TYPE_STRINGTABLE, "font_zones.csv", 0).stringTable;
if (table == nullptr) if (table == nullptr)
{ {
@ -176,7 +172,7 @@ namespace fonts
} }
const auto lang = language::current(); const auto lang = language::current();
const auto lang_name = game::languages[lang].name; const std::string lang_name = game::languages[lang].name;
for (auto row = 0; row < table->rowCount; row++) for (auto row = 0; row < table->rowCount; row++)
{ {
if (table->columnCount < 3) if (table->columnCount < 3)
@ -186,7 +182,13 @@ namespace fonts
const auto row_values = &table->values[(row * table->columnCount)]; const auto row_values = &table->values[(row * table->columnCount)];
const auto lang_value = row_values[0].string; const auto lang_value = row_values[0].string;
if (std::strcmp(lang_value, lang_name) && lang_value != "*"s) const auto is_replacement = lang_value != "*"s;
if (lang_value != lang_name && is_replacement)
{
continue;
}
if (custom_fonts_disabled && is_replacement)
{ {
continue; continue;
} }