From 4d3050cac4fb67fea1aaee5b1b888193a1276f6e Mon Sep 17 00:00:00 2001 From: Luke Street Date: Mon, 6 Apr 2020 14:31:37 -0400 Subject: [PATCH] COmegaPirate: Add call to AvoidStaticCollisionWithinRadius --- Runtime/MP1/World/COmegaPirate.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Runtime/MP1/World/COmegaPirate.cpp b/Runtime/MP1/World/COmegaPirate.cpp index b03cc0b29..7fffa01d7 100644 --- a/Runtime/MP1/World/COmegaPirate.cpp +++ b/Runtime/MP1/World/COmegaPirate.cpp @@ -2,6 +2,7 @@ #include "Runtime/Collision/CCollisionActor.hpp" #include "Runtime/Collision/CCollisionActorManager.hpp" +#include "Runtime/Collision/CGameCollision.hpp" #include "Runtime/CSimplePool.hpp" #include "Runtime/GameGlobalObjects.hpp" #include "Runtime/Graphics/CBooRenderer.hpp" @@ -869,7 +870,9 @@ void COmegaPirate::Think(float dt, CStateManager& mgr) { } 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_ += dt; @@ -1345,7 +1348,7 @@ void COmegaPirate::Destroy(CStateManager& mgr) { launcher->SetActive(false); } SetActive(false); - mgr.SetBossParams(kInvalidUniqueId, 0.f, 0x59); + mgr.SetBossParams(kInvalidUniqueId, 0.f, 89); xa38_collisionActorMgr1->SetActive(mgr, false); xa9c_collisionActorMgr2->SetActive(mgr, false); }