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

Initial CCollisionActor imps, minor cleanup

Browse Source
This commit is contained in:
Phillip Stephens
2017-02-20 19:29:28 -08:00
parent 50fe6d34ab
commit fc51cd38aa
17 changed files with 444 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/World/CScriptActor.cpp
View File

@@ -11,11 +11,11 @@ namespace urde
{
CScriptActor::CScriptActor(TUniqueId uid, const std::string& name, const CEntityInfo& info, const zeus::CTransform& xf,
CModelData&& mData, const zeus::CAABox& aabb, float f1, float zMomentum,
CModelData&& mData, const zeus::CAABox& aabb, float mass, float zMomentum,
const CMaterialList& matList, const CHealthInfo& hInfo, const CDamageVulnerability& dVuln,
const CActorParameters& actParms, bool looping, bool active, u32 w1, float f3, bool b2,
bool castsShadow, bool b4, bool b5)
: CPhysicsActor(uid, active, name, info, xf, std::move(mData), matList, aabb, SMoverData(f1), actParms, 0.3f, 0.1f)
: CPhysicsActor(uid, active, name, info, xf, std::move(mData), matList, aabb, SMoverData(mass), actParms, 0.3f, 0.1f)
, x258_initialHealth(hInfo)
, x260_currentHealth(hInfo)
, x268_damageVulnerability(dVuln)