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

Fix font crash 2

Browse Source
This commit is contained in:
fed 2023-02-22 21:38:41 +01:00
parent 7de396f054
commit 0ea88fa8e7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,7 +120,7 @@ namespace fonts
utils::memory::get_allocator()->free(font); utils::memory::get_allocator()->free(font);
} }
game::TTF* load_font(const std::string& name) game::TTF* load_font(const std::string& name, const std::string& original_name)
{ {
return font_data.access<game::TTF*>([&](font_data_t& data_) -> game::TTF* return font_data.access<game::TTF*>([&](font_data_t& data_) -> game::TTF*
{ {
@ -140,18 +140,18 @@ namespace fonts
return nullptr; return nullptr;
} }
const auto material = create_font(name, data); const auto material = create_font(original_name, data);
data_.fonts[name] = material; data_.fonts[name] = material;
return material; return material;
}); });
} }
game::TTF* try_load_font(const std::string& name) game::TTF* try_load_font(const std::string& name, const std::string& original_name)
{ {
try try
{ {
return load_font(name); return load_font(name, original_name);
} }
catch (const std::exception& e) catch (const std::exception& e)
{ {
@ -164,7 +164,7 @@ namespace fonts
game::TTF* db_find_xasset_header_stub(game::XAssetType type, const char* name, int create_default) game::TTF* db_find_xasset_header_stub(game::XAssetType type, const char* name, int create_default)
{ {
const auto name_ = get_font_replacement(name); const auto name_ = get_font_replacement(name);
auto result = try_load_font(name_); auto result = try_load_font(name_, name);
if (result == nullptr) if (result == nullptr)
{ {