2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 14:27:43 +00:00

Merge fixes

This commit is contained in:
Jack Andersen
2018-12-12 21:47:50 -10:00
parent 001d4ab7dc
commit ccf87925b9
3 changed files with 2 additions and 7 deletions

View File

@@ -848,10 +848,6 @@ void CPatterned::TryJump(CStateManager& mgr, int arg) {
x450_bodyController->GetCommandMgr().DeliverCmd(CBCJumpCmd(x2e0_destPos, pas::EJumpType(arg)));
}
void CPatterned::TryMeleeAttack(CStateManager& mgr, int arg) {
x450_bodyController->GetCommandMgr().DeliverCmd(CBCMeleeAttackCmd(pas::ESeverity(arg)));
}
void CPatterned::TryTurn(CStateManager& mgr, int arg) {
x450_bodyController->GetCommandMgr().DeliverCmd(
CBCLocomotionCmd(zeus::CVector3f::skZero, (x2e0_destPos - GetTranslation()).normalized(), 1.f));