AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 09:47:43 +00:00
Code Issues Projects Releases Wiki Activity

Various bug fixes

Browse Source
This commit is contained in:
Jack Andersen
2018-11-18 15:19:44 -10:00
parent 57c1196599
commit 35a3923cdf
21 changed files with 68 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/Character/CBodyState.cpp
View File

@@ -1957,9 +1957,9 @@ float CBSLocomotion::GetStartVelocityMagnitude(CBodyController& bc)
return 0.f;
}
void CBSLocomotion::ReStartBodyState(CBodyController& bc, bool b)
void CBSLocomotion::ReStartBodyState(CBodyController& bc, bool maintainVel)
{
UpdateLocomotionAnimation(0.f, b ? GetStartVelocityMagnitude(bc) : 0.f, bc, true);
UpdateLocomotionAnimation(0.f, maintainVel ? GetStartVelocityMagnitude(bc) : 0.f, bc, true);
}
float CBSLocomotion::ComputeWeightPercentage(const std::pair<s32, float>& a,
@@ -1974,7 +1974,7 @@ float CBSLocomotion::ComputeWeightPercentage(const std::pair<s32, float>& a,
void CBSLocomotion::Start(CBodyController& bc, CStateManager& mgr)
{
x4_locomotionType = bc.GetLocomotionType();
if (bc.GetCommandMgr().GetCmd(EBodyStateCmd::Thirteen))
if (bc.GetCommandMgr().GetCmd(EBodyStateCmd::MaintainVelocity))
ReStartBodyState(bc, true);
else
ReStartBodyState(bc, false);

2
Runtime/Character/CBodyState.hpp
View File

@@ -347,7 +347,7 @@ class CBSLocomotion : public CBodyState
protected:
pas::ELocomotionType x4_locomotionType = pas::ELocomotionType::Invalid;
float GetStartVelocityMagnitude(CBodyController& bc);
void ReStartBodyState(CBodyController& bc, bool);
void ReStartBodyState(CBodyController& bc, bool maintainVel);
float ComputeWeightPercentage(const std::pair<s32, float>& a,
const std::pair<s32, float>& b, float f) const;
public:

2
Runtime/Character/CBodyStateCmdMgr.hpp
View File

@@ -323,7 +323,7 @@ class CBodyStateCmdMgr
CBodyStateCmd x16c_ = {EBodyStateCmd::ExitState};
CBodyStateCmd x174_ = {EBodyStateCmd::LeanFromCover};
CBodyStateCmd x17c_ = {EBodyStateCmd::NextState};
CBodyStateCmd x184_ = {EBodyStateCmd::Thirteen};
CBodyStateCmd x184_ = {EBodyStateCmd::MaintainVelocity};
CBCGenerateCmd x18c_generate;
CBCHurledCmd x1ac_hurled;
CBCJumpCmd x1d0_jump;

2
Runtime/Character/CharacterCommon.hpp
View File

@@ -250,7 +250,7 @@ enum class EBodyStateCmd
ExitState,
LeanFromCover,
NextState,
Thirteen,
MaintainVelocity,
Generate,
Hurled,
Jump,