AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-15 12:46:08 +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

2
Runtime/MP1/World/CMetroidPrimeProjectile.cpp
View File

@@ -25,7 +25,7 @@ CMetroidPrimeProjectile::CMetroidPrimeProjectile(
const zeus::CTransform& xf, EMaterialTypes materials, const CDamageInfo& damage,
TUniqueId uid, TAreaId aid, TUniqueId owner, const SPrimeProjectileInfo& auxData,
TUniqueId homingTarget, EProjectileAttrib attribs, const zeus::CVector3f& scale,
const rstl::optional_object<TLockedToken<CGenDescription>>& visorParticle,
const std::experimental::optional<TLockedToken<CGenDescription>>& visorParticle,
u16 visorSfx, bool sendCollideMsg)
: CEnergyProjectile(active, desc, type, xf, materials, damage, uid, aid, owner, homingTarget, attribs, false,
scale, visorParticle, visorSfx, sendCollideMsg), x3d8_auxData(auxData)