2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-17 22:45:23 +00:00

New code style refactor

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

View File

@@ -2,54 +2,46 @@
#include "World/CPatterned.hpp"
namespace urde::MP1
{
class CFlickerBat final : public CPatterned
{
namespace urde::MP1 {
class CFlickerBat final : public CPatterned {
public:
enum class EFlickerBatState
{
Zero,
One,
Two,
Three
};
enum class EFlickerBatState { Zero, One, Two, Three };
private:
float x568_ = 0.f;
float x56c_ = 0.f;
float x570_ = 0.f;
EFlickerBatState x574_state;
float x578_ = 1.f;
float x57c_ = 0.f;
bool x580_24_ : 1;
bool x580_25_heardShot : 1;
bool x580_26_ : 1;
bool x580_27_ : 1;
float x568_ = 0.f;
float x56c_ = 0.f;
float x570_ = 0.f;
EFlickerBatState x574_state;
float x578_ = 1.f;
float x57c_ = 0.f;
bool x580_24_ : 1;
bool x580_25_heardShot : 1;
bool x580_26_ : 1;
bool x580_27_ : 1;
public:
DEFINE_PATTERNED(FlickerBat)
CFlickerBat(TUniqueId, std::string_view name, EFlavorType, const CEntityInfo&, const zeus::CTransform&, CModelData&&,
const CPatternedInfo&, EColliderType, bool, const CActorParameters&, bool);
DEFINE_PATTERNED(FlickerBat)
CFlickerBat(TUniqueId, std::string_view name, EFlavorType, const CEntityInfo&, const zeus::CTransform&, CModelData&&,
const CPatternedInfo&, EColliderType, bool, const CActorParameters&, bool);
void Accept(IVisitor&);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void Think(float, CStateManager&);
void Render(const CStateManager&) const;
void Touch(CActor&, CStateManager&);
void DoUserAnimEvent(CStateManager&, const CInt32POINode&, EUserEventType, float dt);
void Death(CStateManager& mgr, const zeus::CVector3f& direction, EScriptObjectState state);
bool CanBeShot(CStateManager&, int);
void Patrol(CStateManager&, EStateMsg, float);
void Attack(CStateManager&, EStateMsg, float);
void Shuffle(CStateManager&, EStateMsg, float);
void Taunt(CStateManager&, EStateMsg, float);
bool InPosition(CStateManager&, float);
bool HearShot(CStateManager&, float);
EFlickerBatState GetFlickerBatState() const { return x574_state; }
void SetFlickerBatState(EFlickerBatState state, CStateManager&);
void FlickerBatStateChanged(EFlickerBatState, CStateManager&);
void CheckStaticIntersection(CStateManager&);
void Accept(IVisitor&);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void Think(float, CStateManager&);
void Render(const CStateManager&) const;
void Touch(CActor&, CStateManager&);
void DoUserAnimEvent(CStateManager&, const CInt32POINode&, EUserEventType, float dt);
void Death(CStateManager& mgr, const zeus::CVector3f& direction, EScriptObjectState state);
bool CanBeShot(CStateManager&, int);
void Patrol(CStateManager&, EStateMsg, float);
void Attack(CStateManager&, EStateMsg, float);
void Shuffle(CStateManager&, EStateMsg, float);
void Taunt(CStateManager&, EStateMsg, float);
bool InPosition(CStateManager&, float);
bool HearShot(CStateManager&, float);
EFlickerBatState GetFlickerBatState() const { return x574_state; }
void SetFlickerBatState(EFlickerBatState state, CStateManager&);
void FlickerBatStateChanged(EFlickerBatState, CStateManager&);
void CheckStaticIntersection(CStateManager&);
};
}
} // namespace urde::MP1