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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/MP1/World/CPuddleSpore.cpp
View File

@ -301,12 +301,12 @@ void CPuddleSpore::GetUp(CStateManager& mgr, EStateMsg msg, float) {
void CPuddleSpore::Attack(CStateManager& mgr, EStateMsg msg, float) { void CPuddleSpore::Attack(CStateManager& mgr, EStateMsg msg, float) {
if (msg == EStateMsg::Activate) { if (msg == EStateMsg::Activate) {
x32c_animState = EAnimState::One; x32c_animState = EAnimState::Ready;
x598_ = 0.f; x598_ = 0.f;
} else if (msg == EStateMsg::Update) { } else if (msg == EStateMsg::Update) {
TryCommand(mgr, pas::EAnimationState::MeleeAttack, &CPatterned::TryMeleeAttack, 1); TryCommand(mgr, pas::EAnimationState::MeleeAttack, &CPatterned::TryMeleeAttack, 1);
} else if (msg == EStateMsg::Deactivate) { } else if (msg == EStateMsg::Deactivate) {
x32c_animState = EAnimState::Zero; x32c_animState = EAnimState::NotReady;
} }
} }
} }

4
Runtime/World/CPatterned.cpp
View File

@ -848,10 +848,6 @@ void CPatterned::TryJump(CStateManager& mgr, int arg) {
x450_bodyController->GetCommandMgr().DeliverCmd(CBCJumpCmd(x2e0_destPos, pas::EJumpType(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) { void CPatterned::TryTurn(CStateManager& mgr, int arg) {
x450_bodyController->GetCommandMgr().DeliverCmd( x450_bodyController->GetCommandMgr().DeliverCmd(
CBCLocomotionCmd(zeus::CVector3f::skZero, (x2e0_destPos - GetTranslation()).normalized(), 1.f)); CBCLocomotionCmd(zeus::CVector3f::skZero, (x2e0_destPos - GetTranslation()).normalized(), 1.f));

1
Runtime/World/CPatterned.hpp
View File

@ -321,7 +321,6 @@ public:
void TryMeleeAttack(CStateManager& mgr, int arg); void TryMeleeAttack(CStateManager& mgr, int arg);
void TryGenerate(CStateManager& mgr, int arg); void TryGenerate(CStateManager& mgr, int arg);
void TryJump(CStateManager& mgr, int arg); void TryJump(CStateManager& mgr, int arg);
void TryMeleeAttack(CStateManager& mgr, int arg);
void TryTurn(CStateManager& mgr, int arg); void TryTurn(CStateManager& mgr, int arg);
void TryGetUp(CStateManager& mgr, int arg); void TryGetUp(CStateManager& mgr, int arg);
void TryTaunt(CStateManager& mgr, int arg); void TryTaunt(CStateManager& mgr, int arg);