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

Merge remote-tracking branch 'origin/icesheegoth'

Browse Source
This commit is contained in:
Luke Street
2020-06-06 16:27:08 -04:00
parent feb163e107 5724be3294
commit ca96676057
13 changed files with 1812 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/Character/CBodyStateCmdMgr.hpp
View File

@@ -258,14 +258,14 @@ public:
class CBCLoopAttackCmd : public CBodyStateCmd {
pas::ELoopAttackType x8_type = pas::ELoopAttackType::Invalid;
u32 xc_waitForAnimOver = 0;
bool xc_waitForAnimOver = false;
public:
constexpr explicit CBCLoopAttackCmd() : CBodyStateCmd(EBodyStateCmd::LoopAttack) {}
constexpr explicit CBCLoopAttackCmd(pas::ELoopAttackType type)
: CBodyStateCmd(EBodyStateCmd::LoopAttack), x8_type(type) {}
constexpr explicit CBCLoopAttackCmd(pas::ELoopAttackType type, bool waitForAnimOver = false)
: CBodyStateCmd(EBodyStateCmd::LoopAttack), x8_type(type), xc_waitForAnimOver(waitForAnimOver) {}
constexpr pas::ELoopAttackType GetAttackType() const { return x8_type; }
constexpr bool WaitForAnimOver() const { return xc_waitForAnimOver == 1; }
constexpr bool WaitForAnimOver() const { return xc_waitForAnimOver ; }
};
class CBCTauntCmd : public CBodyStateCmd {