Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Swap FontIcon finding method from DB_FindXAssetHeader to DB_FindXAssetEntry

Browse Source
This commit is contained in:
Jan 2021-09-05 17:04:35 +02:00
parent 9cb8a02546
commit 089d3c9180
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Components/Modules/TextRenderer.cpp
View File

@ -146,10 +146,11 @@ namespace Components
const std::string fontIconName(text, curPos - text); const std::string fontIconName(text, curPos - text);
auto* material = Game::DB_FindXAssetHeader(Game::XAssetType::ASSET_TYPE_MATERIAL, fontIconName.data()).material; auto* materialEntry = Game::DB_FindXAssetEntry(Game::XAssetType::ASSET_TYPE_MATERIAL, fontIconName.data());
if (material == nullptr || material->techniqueSet == nullptr || material->techniqueSet->name == nullptr || strcmp(material->techniqueSet->name, "2d") != 0) if (materialEntry == nullptr)
return false; return false;
if (Game::DB_IsXAssetDefault(Game::ASSET_TYPE_MATERIAL, material->info.name)) auto* material = materialEntry->asset.header.material;
if (material == nullptr || material->techniqueSet == nullptr || material->techniqueSet->name == nullptr || strcmp(material->techniqueSet->name, "2d") != 0)
return false; return false;
text = curPos + 1; text = curPos + 1;