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

Remove rstl::optional_object, various cleanups, implement CExplosion and CScriptDoor

Browse Source
This commit is contained in:
Phillip Stephens
2018-04-29 20:12:41 -07:00
parent 6d60ccfd04
commit 711c3e0d2c
79 changed files with 486 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Runtime/Particle/CElementGen.cpp
View File

@@ -1035,6 +1035,7 @@ void CElementGen::RenderModels()
CParticleGlobals::SetParticleLifetime(particle.x0_endFrame - particle.x28_startFrame);
int partFrame = x74_curFrame - particle.x28_startFrame - 1;
CParticleGlobals::UpdateParticleLifetimeTweenValues(partFrame);
CParticleGlobals::g_particleAccessParameters = &x60_advValues[i];
CVectorElement* pmop = desc->x6c_x58_PMOP.get();
if (pmop)
pmop->GetValue(partFrame, pmopVec);
@@ -1936,10 +1937,10 @@ bool CElementGen::IsSystemDeletable() const
return false;
}
rstl::optional_object<zeus::CAABox> CElementGen::GetBounds() const
std::experimental::optional<zeus::CAABox> CElementGen::GetBounds() const
{
if (GetParticleCountAll() == 0)
return {};
return std::experimental::nullopt;
else
return {x2f0_systemBounds};
}