AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CIceSheegoth: Call the correct PathFind... I'm an idiot

This commit is contained in:
Phillip Stephens 2020-04-24 07:42:39 -07:00
parent 7b9fecfdc6
commit 86acf6dce7
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/MP1/World/CIceSheegoth.cpp
View File

@ -498,7 +498,7 @@ void CIceSheegoth::Attack(CStateManager& mgr, EStateMsg msg, float dt) {
xb28_25_ = true; xb28_25_ = true;
x2e0_destPos = mgr.GetPlayer().GetAimPosition(mgr, 0.f); x2e0_destPos = mgr.GetPlayer().GetAimPosition(mgr, 0.f);
SetPathFindMode(EPathFindMode::Normal); SetPathFindMode(EPathFindMode::Normal);
PathFind(mgr, msg, dt); CPatterned::PathFind(mgr, msg, dt);
SetCollisionActorExtendedTouchBounds(mgr, zeus::CVector3f{2.f}); SetCollisionActorExtendedTouchBounds(mgr, zeus::CVector3f{2.f});
x95c_ = 0.f; x95c_ = 0.f;
} else if (msg == EStateMsg::Update) { } else if (msg == EStateMsg::Update) {
@ -518,7 +518,7 @@ void CIceSheegoth::Attack(CStateManager& mgr, EStateMsg msg, float dt) {
if (GetTransform().frontVector().dot(mgr.GetPlayer().GetTranslation() - mouthXf.origin) > 0.f) { if (GetTransform().frontVector().dot(mgr.GetPlayer().GetTranslation() - mouthXf.origin) > 0.f) {
SetPathFindMode(EPathFindMode::Normal); SetPathFindMode(EPathFindMode::Normal);
if (GetSearchPath() != nullptr && !PathShagged(mgr, 0.f)) { if (GetSearchPath() != nullptr && !PathShagged(mgr, 0.f)) {
PathFind(mgr, EStateMsg::Update, dt); CPatterned::PathFind(mgr, EStateMsg::Update, dt);
} else { } else {
x568_ = 4; x568_ = 4;
} }
@ -712,7 +712,7 @@ void CIceSheegoth::Approach(CStateManager& mgr, EStateMsg msg, float dt) {
x2e0_destPos = GetTranslation(); x2e0_destPos = GetTranslation();
} }
x92c_lastDest = x2e0_destPos; x92c_lastDest = x2e0_destPos;
PathFind(mgr, EStateMsg::Activate, dt); CPatterned::PathFind(mgr, EStateMsg::Activate, dt);
if (!xb29_27_) { if (!xb29_27_) {
GetBodyController()->GetCommandMgr().ClearLocomotionCmds(); GetBodyController()->GetCommandMgr().ClearLocomotionCmds();
} }
@ -722,7 +722,7 @@ void CIceSheegoth::Approach(CStateManager& mgr, EStateMsg msg, float dt) {
if (x56c_sheegothData.Get_x1f0_24() && GetSearchPath() != nullptr && !PathShagged(mgr, 0.f) && if (x56c_sheegothData.Get_x1f0_24() && GetSearchPath() != nullptr && !PathShagged(mgr, 0.f) &&
x760_pathSearch.GetCurrentWaypoint() < x760_pathSearch.GetWaypoints().size() - 1) { x760_pathSearch.GetCurrentWaypoint() < x760_pathSearch.GetWaypoints().size() - 1) {
PathFind(mgr, EStateMsg::Update, dt); CPatterned::PathFind(mgr, EStateMsg::Update, dt);
} else { } else {
const zeus::CVector3f posDiff = mgr.GetPlayer().GetTranslation() - GetTranslation(); const zeus::CVector3f posDiff = mgr.GetPlayer().GetTranslation() - GetTranslation();
if (sub_8019ecdc(mgr, zeus::degToRad(15.f)) && posDiff.canBeNormalized()) { if (sub_8019ecdc(mgr, zeus::degToRad(15.f)) && posDiff.canBeNormalized()) {