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

CDrone: StrafeFromCompanions fixes

This commit is contained in:
Luke Street 2020-09-13 22:47:21 -04:00
parent 3659bedad1
commit 979b0278da
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Runtime/MP1/World/CDrone.cpp
View File

@ -963,15 +963,15 @@ void CDrone::StrafeFromCompanions(CStateManager& mgr) {
} }
} }
if (nearestPos.isZero()) if (nearestPos.isZero() || minDist > x61c_ * x61c_)
return; return;
zeus::CVector3f off = nearestPos - GetTranslation(); const auto off = nearestPos - GetTranslation();
const float rightOff = GetTransform().basis[0].dot(off); const float rightOff = GetTransform().rightVector().dot(off);
if (rightOff > -0.2f && rightOff < 0.2f) { if (rightOff < -0.2f) {
x450_bodyController->GetCommandMgr().DeliverCmd(CBCStepCmd(pas::EStepDirection::Left, pas::EStepType::Normal));
} else {
x450_bodyController->GetCommandMgr().DeliverCmd(CBCStepCmd(pas::EStepDirection::Right, pas::EStepType::Normal)); x450_bodyController->GetCommandMgr().DeliverCmd(CBCStepCmd(pas::EStepDirection::Right, pas::EStepType::Normal));
} else if (rightOff > 0.2f) {
x450_bodyController->GetCommandMgr().DeliverCmd(CBCStepCmd(pas::EStepDirection::Left, pas::EStepType::Normal));
} }
} }