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

CIceSheegoth/CMetroid: Use pas::EAnimationState

This commit is contained in:
Luke Street 2021-03-01 23:55:55 -05:00
parent bb4bdfa1ee
commit 09d23ef519
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Runtime/MP1/World/CIceSheegoth.cpp
View File

@ -112,7 +112,8 @@ CIceSheegoth::CIceSheegoth(TUniqueId uid, std::string_view name, const CEntityIn
x460_knockBackController.SetX82_24(false); x460_knockBackController.SetX82_24(false);
x460_knockBackController.SetEnableLaggedBurnDeath(false); x460_knockBackController.SetEnableLaggedBurnDeath(false);
x460_knockBackController.SetEnableExplodeDeath(false); x460_knockBackController.SetEnableExplodeDeath(false);
x950_ = GetAnimationDistance(CPASAnimParmData(3, CPASAnimParm::FromEnum(1), CPASAnimParm::FromEnum(0))) * x950_ = GetAnimationDistance(
CPASAnimParmData(pas::EAnimationState::Step, CPASAnimParm::FromEnum(1), CPASAnimParm::FromEnum(0))) *
GetModelData()->GetScale().y(); GetModelData()->GetScale().y();
xa9c_->SetGlobalScale(GetModelData()->GetScale()); xa9c_->SetGlobalScale(GetModelData()->GetScale());
xab0_->SetGlobalScale(GetModelData()->GetScale()); xab0_->SetGlobalScale(GetModelData()->GetScale());

4
Runtime/MP1/World/CMetroid.cpp
View File

@ -89,8 +89,8 @@ CMetroid::CMetroid(TUniqueId uid, std::string_view name, EFlavorType flavor, con
, x81c_patternedInfo(pInfo) , x81c_patternedInfo(pInfo)
, x954_actParams(aParms) , x954_actParams(aParms)
, x9bc_parent(other) { , x9bc_parent(other) {
x808_loopAttackDistance = x808_loopAttackDistance = GetAnimationDistance(
GetAnimationDistance(CPASAnimParmData{9, CPASAnimParm::FromEnum(2), CPASAnimParm::FromEnum(3)}); CPASAnimParmData{pas::EAnimationState::LoopAttack, CPASAnimParm::FromEnum(2), CPASAnimParm::FromEnum(3)});
UpdateTouchBounds(); UpdateTouchBounds();
SetCoefficientOfRestitutionModifier(0.9f); SetCoefficientOfRestitutionModifier(0.9f);
x460_knockBackController.SetX82_24(false); x460_knockBackController.SetX82_24(false);