2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 22:27:43 +00:00

Massive fmtlib refactor

This commit is contained in:
Jack Andersen
2019-07-19 18:27:21 -10:00
parent e38a3ece89
commit 7a3da1f7a6
228 changed files with 2071 additions and 2116 deletions

View File

@@ -46,7 +46,7 @@ CScriptDebris::CScriptDebris(TUniqueId uid, std::string_view name, const CEntity
{EMaterialTypes::Solid},
{EMaterialTypes::Debris, EMaterialTypes::Character, EMaterialTypes::Player, EMaterialTypes::Projectile}));
if (g_ResFactory->GetResourceTypeById(particleId)) {
if (g_ResFactory->GetResourceTypeById(particleId).IsValid()) {
TToken<CGenDescription> desc = g_SimplePool->GetObj({FOURCC('PART'), particleId});
x2d4_particleGens[0] = std::make_unique<CElementGen>(desc, CElementGen::EModelOrientationType::Normal,
CElementGen::EOptionalSystemFlags::One);
@@ -115,21 +115,21 @@ CScriptDebris::CScriptDebris(TUniqueId uid, std::string_view name, const CEntity
EMaterialTypes::Solid}));
}
if (g_ResFactory->GetResourceTypeById(particle1)) {
if (g_ResFactory->GetResourceTypeById(particle1).IsValid()) {
TToken<CGenDescription> desc = g_SimplePool->GetObj({FOURCC('PART'), particle1});
x2d4_particleGens[0] = std::make_unique<CElementGen>(desc, CElementGen::EModelOrientationType::Normal,
CElementGen::EOptionalSystemFlags::One);
x2d4_particleGens[0]->SetGlobalScale(particle1Scale);
}
if (g_ResFactory->GetResourceTypeById(particle2)) {
if (g_ResFactory->GetResourceTypeById(particle2).IsValid()) {
TToken<CGenDescription> desc = g_SimplePool->GetObj({FOURCC('PART'), particle2});
x2d4_particleGens[1] = std::make_unique<CElementGen>(desc, CElementGen::EModelOrientationType::Normal,
CElementGen::EOptionalSystemFlags::One);
x2d4_particleGens[1]->SetGlobalScale(particle2Scale);
}
if (g_ResFactory->GetResourceTypeById(particle3)) {
if (g_ResFactory->GetResourceTypeById(particle3).IsValid()) {
TToken<CGenDescription> desc = g_SimplePool->GetObj({FOURCC('PART'), particle3});
x2d4_particleGens[2] = std::make_unique<CElementGen>(desc, CElementGen::EModelOrientationType::Normal,
CElementGen::EOptionalSystemFlags::One);