diff --git a/Runtime/MP1/World/CPuddleSpore.cpp b/Runtime/MP1/World/CPuddleSpore.cpp index 851930713..05fd2e95b 100644 --- a/Runtime/MP1/World/CPuddleSpore.cpp +++ b/Runtime/MP1/World/CPuddleSpore.cpp @@ -301,12 +301,12 @@ void CPuddleSpore::GetUp(CStateManager& mgr, EStateMsg msg, float) { void CPuddleSpore::Attack(CStateManager& mgr, EStateMsg msg, float) { if (msg == EStateMsg::Activate) { - x32c_animState = EAnimState::One; + x32c_animState = EAnimState::Ready; x598_ = 0.f; } else if (msg == EStateMsg::Update) { TryCommand(mgr, pas::EAnimationState::MeleeAttack, &CPatterned::TryMeleeAttack, 1); } else if (msg == EStateMsg::Deactivate) { - x32c_animState = EAnimState::Zero; + x32c_animState = EAnimState::NotReady; } } } \ No newline at end of file diff --git a/Runtime/World/CPatterned.cpp b/Runtime/World/CPatterned.cpp index 2ea8217f8..f3c5c959c 100644 --- a/Runtime/World/CPatterned.cpp +++ b/Runtime/World/CPatterned.cpp @@ -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)); diff --git a/Runtime/World/CPatterned.hpp b/Runtime/World/CPatterned.hpp index b1b83b404..142d217be 100644 --- a/Runtime/World/CPatterned.hpp +++ b/Runtime/World/CPatterned.hpp @@ -321,7 +321,6 @@ public: void TryMeleeAttack(CStateManager& mgr, int arg); void TryGenerate(CStateManager& mgr, int arg); void TryJump(CStateManager& mgr, int arg); - void TryMeleeAttack(CStateManager& mgr, int arg); void TryTurn(CStateManager& mgr, int arg); void TryGetUp(CStateManager& mgr, int arg); void TryTaunt(CStateManager& mgr, int arg);