2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 21:07:42 +00:00

Merge branch 'pr-149'

This commit is contained in:
2020-02-07 19:57:00 -08:00

View File

@@ -153,8 +153,9 @@ void CMetaree::Active(CStateManager& mgr, EStateMsg msg, float) {
void CMetaree::InActive(CStateManager&, EStateMsg msg, float) {
if (msg == EStateMsg::Activate) {
if (!x5ca_26_deactivated)
x450_bodyController->SetLocomotionType(pas::ELocomotionType::Relaxed);
const auto locomotionType = x5ca_26_deactivated ? pas::ELocomotionType::Crouch
: pas::ELocomotionType::Relaxed;
x450_bodyController->SetLocomotionType(locomotionType);
} else if (msg == EStateMsg::Deactivate) {
x5ca_26_deactivated = true;
}