AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-07-01 13:33:32 +00:00
Code Issues Projects Releases Wiki Activity

COmegaPirate: Add call to AvoidStaticCollisionWithinRadius

Browse Source
This commit is contained in:
Luke Street 2020-04-06 14:31:37 -04:00
parent ab8e00880e
commit 4d3050cac4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Runtime/MP1/World/COmegaPirate.cpp
View File

@ -2,6 +2,7 @@
#include "Runtime/Collision/CCollisionActor.hpp" #include "Runtime/Collision/CCollisionActor.hpp"
#include "Runtime/Collision/CCollisionActorManager.hpp" #include "Runtime/Collision/CCollisionActorManager.hpp"
#include "Runtime/Collision/CGameCollision.hpp"
#include "Runtime/CSimplePool.hpp" #include "Runtime/CSimplePool.hpp"
#include "Runtime/GameGlobalObjects.hpp" #include "Runtime/GameGlobalObjects.hpp"
#include "Runtime/Graphics/CBooRenderer.hpp" #include "Runtime/Graphics/CBooRenderer.hpp"
@ -869,7 +870,9 @@ void COmegaPirate::Think(float dt, CStateManager& mgr) {
} }
if (xb8c_ > 0.f) { if (xb8c_ > 0.f) {
// TODO CGameCollision unimplemented method const zeus::CAABox& box = GetBoundingBox();
CGameCollision::AvoidStaticCollisionWithinRadius(mgr, *this, 8, dt, 1.f, 1.5f * (box.max.x() - box.min.x()),
10000.f, 0.25f);
xb8c_ = 0.f; xb8c_ = 0.f;
} }
xb8c_ += dt; xb8c_ += dt;
@ -1345,7 +1348,7 @@ void COmegaPirate::Destroy(CStateManager& mgr) {
launcher->SetActive(false); launcher->SetActive(false);
} }
SetActive(false); SetActive(false);
mgr.SetBossParams(kInvalidUniqueId, 0.f, 0x59); mgr.SetBossParams(kInvalidUniqueId, 0.f, 89);
xa38_collisionActorMgr1->SetActive(mgr, false); xa38_collisionActorMgr1->SetActive(mgr, false);
xa9c_collisionActorMgr2->SetActive(mgr, false); xa9c_collisionActorMgr2->SetActive(mgr, false);
} }