AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-11 13:07:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/animationstate'

Browse Source 
# Conflicts:
#	Runtime/MP1/World/CFlyingPirate.cpp
#	Runtime/World/CScriptGunTurret.cpp
This commit is contained in:
Luke Street
2021-03-01 23:45:21 -05:00
parent 60656b5a5d 14c92e85ce
commit bb4bdfa1ee
26 changed files with 340 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/World/CPatterned.cpp
View File

@@ -1024,8 +1024,8 @@ void CPatterned::BuildBodyController(EBodyType bodyType) {
}
x450_bodyController = std::make_unique<CBodyController>(*this, x3b8_turnSpeed, bodyType);
auto anim =
x450_bodyController->GetPASDatabase().FindBestAnimation(CPASAnimParmData(24, CPASAnimParm::FromEnum(0)), -1);
auto anim = x450_bodyController->GetPASDatabase().FindBestAnimation(
CPASAnimParmData(pas::EAnimationState::AdditiveReaction, CPASAnimParm::FromEnum(0)), -1);
x460_knockBackController.x81_26_enableShock = anim.first > 0.f;
}