AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-11 02:27:43 +00:00
Code Issues Projects Releases Wiki Activity

All CPatterned functions implemented

Browse Source
This commit is contained in:
Jack Andersen
2018-11-10 17:27:54 -10:00
parent 87e5aea6f5
commit d4bb7d64eb
27 changed files with 1383 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/World/CActor.cpp
View File

@@ -37,7 +37,7 @@ CActor::CActor(TUniqueId uid, bool active, std::string_view name, const CEntityI
x90_actorLights = mData.IsNull() ? std::unique_ptr<CActorLights>() : params.x0_lightParms.MakeActorLights();
if (mData.x10_animData || mData.x1c_normalModel)
x64_modelData = std::make_unique<CModelData>(std::move(mData));
xd0_thermalMag = params.x64_thermalMag;
xd0_damageMag = params.x64_thermalMag;
xd8_nonLoopingSfxHandles.resize(2);
xe4_27_notInSortedLists = true;
xe4_28_transformDirty = true;
@@ -241,14 +241,14 @@ void CActor::RenderInternal(const CStateManager& mgr) const
{
float addMag;
float mulMag = 1.f;
if (xd0_thermalMag <= 1.f)
if (xd0_damageMag <= 1.f)
{
mulMag = xd0_thermalMag;
mulMag = xd0_damageMag;
addMag = 0.f;
}
else if (xd0_thermalMag < 2.f)
else if (xd0_damageMag < 2.f)
{
addMag = xd0_thermalMag - 1.f;
addMag = xd0_damageMag - 1.f;
}
else
{