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

CChozoGhost: Add missing call to SetAnimationStateRange

This commit is contained in:
Luke Street 2020-05-20 23:45:44 -04:00
parent eddaa24b1e
commit 8f56219900
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -299,13 +299,15 @@ void CChozoGhost::DoUserAnimEvent(CStateManager& mgr, const CInt32POINode& node,
void CChozoGhost::KnockBack(const zeus::CVector3f& dir, CStateManager& mgr, const CDamageInfo& info, void CChozoGhost::KnockBack(const zeus::CVector3f& dir, CStateManager& mgr, const CDamageInfo& info,
EKnockBackType type, bool inDeferred, float magnitude) { EKnockBackType type, bool inDeferred, float magnitude) {
if (!IsAlive()) if (!IsAlive()) {
x460_knockBackController.SetAvailableState(EKnockBackAnimationState::Hurled, false); x460_knockBackController.SetAvailableState(EKnockBackAnimationState::Hurled, false);
else if (!x460_knockBackController.TestAvailableState(EKnockBackAnimationState::KnockBack) && } else if (!x460_knockBackController.TestAvailableState(EKnockBackAnimationState::KnockBack) &&
info.GetWeaponMode().IsCharged()) info.GetWeaponMode().IsCharged()) {
x460_knockBackController.SetAnimationStateRange(EKnockBackAnimationState::Hurled, EKnockBackAnimationState::Fall); x460_knockBackController.SetAnimationStateRange(EKnockBackAnimationState::Hurled, EKnockBackAnimationState::Fall);
}
CPatterned::KnockBack(dir, mgr, info, type, inDeferred, magnitude); CPatterned::KnockBack(dir, mgr, info, type, inDeferred, magnitude);
x460_knockBackController.SetAnimationStateRange(EKnockBackAnimationState::Flinch, EKnockBackAnimationState::Fall);
if (!IsAlive()) { if (!IsAlive()) {
Stop(); Stop();
x150_momentum.zeroOut(); x150_momentum.zeroOut();