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

New code style refactor

Browse Source
This commit is contained in:
Jack Andersen
2018-12-07 19:30:43 -10:00
parent 41ae32be31
commit 636c82a568
1451 changed files with 171430 additions and 203303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Runtime/Weapon/CGSComboFire.hpp
View File

@@ -2,36 +2,32 @@
#include "RetroTypes.hpp"
namespace urde
{
namespace urde {
class CAnimData;
class CStateManager;
class CGSComboFire
{
float x0_delay = 0.f;
s32 x4_loopState = -1; // In, loop, out
s32 x8_cueAnimId = -1;
s32 xc_gunId = -1;
class CGSComboFire {
float x0_delay = 0.f;
s32 x4_loopState = -1; // In, loop, out
s32 x8_cueAnimId = -1;
s32 xc_gunId = -1;
union
{
struct
{
bool x10_24_over : 1;
bool x10_25_idle : 1;
};
u8 _dummy = 0;
union {
struct {
bool x10_24_over : 1;
bool x10_25_idle : 1;
};
u8 _dummy = 0;
};
public:
bool IsComboOver() const { return x10_24_over; }
s32 GetLoopState() const { return x4_loopState; }
void SetLoopState(s32 l) { x4_loopState = l; }
void SetIdle(bool i) { x10_25_idle = i; }
s32 GetGunId() const { return xc_gunId; }
bool Update(CAnimData& data, float dt, CStateManager& mgr);
s32 SetAnim(CAnimData& data, s32 gunId, s32 loopState, CStateManager& mgr, float delay);
bool IsComboOver() const { return x10_24_over; }
s32 GetLoopState() const { return x4_loopState; }
void SetLoopState(s32 l) { x4_loopState = l; }
void SetIdle(bool i) { x10_25_idle = i; }
s32 GetGunId() const { return xc_gunId; }
bool Update(CAnimData& data, float dt, CStateManager& mgr);
s32 SetAnim(CAnimData& data, s32 gunId, s32 loopState, CStateManager& mgr, float delay);
};
}
} // namespace urde