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

Implement CNewIntroBoss

Browse Source
This commit is contained in:
Phillip Stephens
2018-11-16 21:05:57 -08:00
parent cc4a895818
commit ea4848196a
37 changed files with 952 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/Collision/CCollisionActorManager.cpp
View File

@@ -52,6 +52,7 @@ CCollisionActorManager::CCollisionActorManager(CStateManager& mgr, TUniqueId own
}
mgr.AddObject(newAct);
x0_jointDescriptions.push_back(desc);
x0_jointDescriptions.back().SetCollisionActorId(newAct->GetUniqueId());
}
else
{
@@ -134,6 +135,7 @@ void CCollisionActorManager::Destroy(CStateManager& mgr) const
void CCollisionActorManager::SetActive(CStateManager& mgr, bool active)
{
x12_active = active;
for (const CJointCollisionDescription& jDesc : x0_jointDescriptions)
{
if (TCastToPtr<CActor> act = mgr.ObjectById(jDesc.GetCollisionActorId()))
@@ -142,7 +144,7 @@ void CCollisionActorManager::SetActive(CStateManager& mgr, bool active)
if (curActive != active)
act->SetActive(active);
if (!curActive)
if (active)
Update(0.f, mgr, EUpdateOptions::WorldSpace);
}
}