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

CDrone: Rename x58c_prevDodgeDir

This commit is contained in:
Luke Street 2020-09-13 19:04:24 -04:00
parent e5b63ba523
commit 7efaadac80
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Runtime/MP1/World/CDrone.cpp
View File

@ -624,18 +624,18 @@ void CDrone::Dodge(CStateManager& mgr, EStateMsg msg, float dt) {
} else if (msg == EStateMsg::Update) { } else if (msg == EStateMsg::Update) {
if (x7c8_ == 0) { if (x7c8_ == 0) {
GetBodyController()->GetCommandMgr().DeliverCmd(CBodyStateCmd(EBodyStateCmd::NextState)); GetBodyController()->GetCommandMgr().DeliverCmd(CBodyStateCmd(EBodyStateCmd::NextState));
if (x58c_ == 5) { if (x58c_prevDodgeDir == pas::EStepDirection::Down) {
GetBodyController()->GetCommandMgr().DeliverCmd(CBCStepCmd(pas::EStepDirection::Left, pas::EStepType::Dodge)); GetBodyController()->GetCommandMgr().DeliverCmd(CBCStepCmd(pas::EStepDirection::Left, pas::EStepType::Dodge));
x58c_ = 2; x58c_prevDodgeDir = pas::EStepDirection::Left;
} else if (x58c_ == 4) { } else if (x58c_prevDodgeDir == pas::EStepDirection::Up) {
GetBodyController()->GetCommandMgr().DeliverCmd(CBCStepCmd(pas::EStepDirection::Down, pas::EStepType::Dodge)); GetBodyController()->GetCommandMgr().DeliverCmd(CBCStepCmd(pas::EStepDirection::Down, pas::EStepType::Dodge));
x58c_ = 5; x58c_prevDodgeDir = pas::EStepDirection::Down;
} else if (x58c_ == 3) { } else if (x58c_prevDodgeDir == pas::EStepDirection::Right) {
GetBodyController()->GetCommandMgr().DeliverCmd(CBCStepCmd(pas::EStepDirection::Up, pas::EStepType::Dodge)); GetBodyController()->GetCommandMgr().DeliverCmd(CBCStepCmd(pas::EStepDirection::Up, pas::EStepType::Dodge));
x58c_ = 4; x58c_prevDodgeDir = pas::EStepDirection::Up;
} else if (x58c_ == 2) { } else if (x58c_prevDodgeDir == pas::EStepDirection::Left) {
GetBodyController()->GetCommandMgr().DeliverCmd(CBCStepCmd(pas::EStepDirection::Right, pas::EStepType::Dodge)); GetBodyController()->GetCommandMgr().DeliverCmd(CBCStepCmd(pas::EStepDirection::Right, pas::EStepType::Dodge));
x58c_ = 3; x58c_prevDodgeDir = pas::EStepDirection::Right;
} }
x7c8_ = 1; x7c8_ = 1;
} else if (x7c8_ == 1 && } else if (x7c8_ == 1 &&

2
Runtime/MP1/World/CDrone.hpp
View File

@ -14,7 +14,7 @@ class CDrone : public CPatterned {
TUniqueId x578_lightId = kInvalidUniqueId; TUniqueId x578_lightId = kInvalidUniqueId;
TUniqueId x57a_ = kInvalidUniqueId; TUniqueId x57a_ = kInvalidUniqueId;
std::vector<CVisorFlare::CFlareDef> x57c_flares; std::vector<CVisorFlare::CFlareDef> x57c_flares;
u32 x58c_ = 2; pas::EStepDirection x58c_prevDodgeDir = pas::EStepDirection::Left;
CDamageInfo x590_; CDamageInfo x590_;
CDamageInfo x5ac_; CDamageInfo x5ac_;
float x5c8_ = 0.f; float x5c8_ = 0.f;