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

CFlaahgra: Fix SetCollisionActorBounds args in Attack

This commit is contained in:
Luke Street 2020-08-12 23:58:03 -04:00
parent 6703529445
commit b24c748e1a
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/CFlaahgra.cpp
View File

@ -25,6 +25,7 @@ namespace urde::MP1 {
constexpr zeus::CColor skDamageColor{0.5f, 0.5f, 0.f, 1.f}; constexpr zeus::CColor skDamageColor{0.5f, 0.5f, 0.f, 1.f};
constexpr zeus::CColor skUnkColor{0.5f, 0.f, 0.f, 1.f}; constexpr zeus::CColor skUnkColor{0.5f, 0.f, 0.f, 1.f};
constexpr zeus::CVector3f skUnkVec1{0.5f, 7.f, 0.f}; constexpr zeus::CVector3f skUnkVec1{0.5f, 7.f, 0.f};
constexpr zeus::CVector3f skUnkVec2{12.f, 12.f, 12.f};
constexpr std::array<SJointInfo, 3> skLeftArmJointList{{ constexpr std::array<SJointInfo, 3> skLeftArmJointList{{
{"L_elbow", "L_blade", 0.6f, 1.f}, {"L_elbow", "L_blade", 0.6f, 1.f},
@ -962,8 +963,8 @@ void CFlaahgra::Attack(CStateManager& mgr, EStateMsg msg, float arg) {
x568_ = kStates1[x7a8_] != pas::ESeverity::Invalid ? 1 : 2; x568_ = kStates1[x7a8_] != pas::ESeverity::Invalid ? 1 : 2;
if (sub801ae670()) { if (sub801ae670()) {
SetCollisionActorBounds(mgr, x79c_leftArmCollision, skUnkVec1); SetCollisionActorBounds(mgr, x79c_leftArmCollision, skUnkVec2);
SetCollisionActorBounds(mgr, x7a0_rightArmCollision, skUnkVec1); SetCollisionActorBounds(mgr, x7a0_rightArmCollision, skUnkVec2);
} }
x798_animState = x450_bodyController->GetBodyStateInfo().GetCurrentStateId(); x798_animState = x450_bodyController->GetBodyStateInfo().GetCurrentStateId();