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

Merge branch 'pr-149'

This commit is contained in:
Phillip Stephens 2020-02-07 19:57:00 -08:00
parent 61f9adfa70 1edcbf7ec6
commit 56cefeecbb
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Runtime/MP1/World/CMetaree.cpp
View File

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