PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-16 03:37:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

const bool fixes, remove override define

Browse Source 
Former-commit-id: 72256e77a5
This commit is contained in:
Phillip Stephens
2023-02-05 23:21:28 -08:00
parent f29f76abb5
commit 38b824cda0
296 changed files with 1192 additions and 1199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/MetroidPrime/BodyState/CABSAim.hpp
View File

@@ -6,9 +6,9 @@
class CABSAim : public CAdditiveBodyState {
public:
CABSAim();
void Start(CBodyController& bc, CStateManager& mgr) override;
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override;
void Shutdown(CBodyController& bc) override;
void Start(CBodyController& bc, CStateManager& mgr);
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr);
void Shutdown(CBodyController& bc);
private:
bool x4_needsIdle;

6
include/MetroidPrime/BodyState/CABSFlinch.hpp
View File

@@ -10,9 +10,9 @@ class CABSFlinch : public CAdditiveBodyState {
public:
CABSFlinch();
void Start(CBodyController& bc, CStateManager& mgr) override;
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override;
void Shutdown(CBodyController& bc) override;
void Start(CBodyController& bc, CStateManager& mgr);
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr);
void Shutdown(CBodyController& bc);
~CABSFlinch();
};

6
include/MetroidPrime/BodyState/CABSIdle.hpp
View File

@@ -7,9 +7,9 @@ class CABSIdle : public CAdditiveBodyState {
pas::EAnimationState GetBodyStateTransition(float dt, CBodyController& bc) const;
public:
void Start(CBodyController& bc, CStateManager& mgr) override {}
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override;
void Shutdown(CBodyController& bc) override {}
void Start(CBodyController& bc, CStateManager& mgr) {}
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr);
void Shutdown(CBodyController& bc) {}
};
#endif // _CABSIDLE

6
include/MetroidPrime/BodyState/CABSReaction.hpp
View File

@@ -8,9 +8,9 @@ public:
CABSReaction();
~CABSReaction();
void Start(CBodyController& bc, CStateManager& mgr) override;
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override;
void Shutdown(CBodyController& bc) override;
void Start(CBodyController& bc, CStateManager& mgr);
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr);
void Shutdown(CBodyController& bc);
float GetWeight() const { return x4_weight; }
bool IsActive() const { return x10_active; }

8
include/MetroidPrime/BodyState/CBSAttack.hpp
View File

@@ -11,10 +11,10 @@ class CBSAttack : public CBodyState {
public:
CBSAttack();
bool CanShoot() const override { return false; }
void Start(CBodyController& bc, CStateManager& mgr) override;
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override;
void Shutdown(CBodyController&) override;
bool CanShoot() const { return false; }
void Start(CBodyController& bc, CStateManager& mgr);
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr);
void Shutdown(CBodyController&);
private:
pas::EAnimationState x4_nextState; // = pas::kAS_Invalid;

12
include/MetroidPrime/BodyState/CBSCover.hpp
View File

@@ -6,12 +6,12 @@
class CBSCover : public CBodyState {
public:
CBSCover();
bool IsMoving() const override { return true; }
bool ApplyHeadTracking() const override { return false; }
bool CanShoot() const override;
void Start(CBodyController& bc, CStateManager& mgr) override;
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override;
void Shutdown(CBodyController&) override;
bool IsMoving() const { return true; }
bool ApplyHeadTracking() const { return false; }
bool CanShoot() const;
void Start(CBodyController& bc, CStateManager& mgr);
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr);
void Shutdown(CBodyController&);
pas::ECoverDirection GetCoverDirection() const { return x8_coverDirection; }
bool GetNeedsExit() const { return xc_needsExit; }

10
include/MetroidPrime/BodyState/CBSDie.hpp
View File

@@ -8,11 +8,11 @@ public:
CBSDie();
~CBSDie();
bool IsDead() const override;
bool IsDying() const override;
void Start(CBodyController& bc, CStateManager& mgr) override;
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override;
void Shutdown(CBodyController&) override;
bool IsDead() const;
bool IsDying() const;
void Start(CBodyController& bc, CStateManager& mgr);
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr);
void Shutdown(CBodyController&);
private:
float x4_remTime;

6
include/MetroidPrime/BodyState/CBSFall.hpp
View File

@@ -8,9 +8,9 @@ public:
CBSFall();
~CBSFall();
void Start(CBodyController& bc, CStateManager& mgr) override;
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override;
void Shutdown(CBodyController& bc) override;
void Start(CBodyController& bc, CStateManager& mgr);
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr);
void Shutdown(CBodyController& bc);
private:
float x4_rotateSpeed;

6
include/MetroidPrime/BodyState/CBSGenerate.hpp
View File

@@ -8,9 +8,9 @@ public:
CBSGenerate();
~CBSGenerate();
void Start(CBodyController& bc, CStateManager& mgr) override;
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override;
void Shutdown(CBodyController&) override;
void Start(CBodyController& bc, CStateManager& mgr);
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr);
void Shutdown(CBodyController&);
private:
pas::EAnimationState GetBodyStateTransition(float dt, CBodyController& bc);

6
include/MetroidPrime/BodyState/CBSGetup.hpp
View File

@@ -8,9 +8,9 @@ public:
CBSGetup();
~CBSGetup();
void Start(CBodyController& bc, CStateManager& mgr) override;
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override;
void Shutdown(CBodyController& bc) override;
void Start(CBodyController& bc, CStateManager& mgr);
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr);
void Shutdown(CBodyController& bc);
private:
pas::EFallState x4_fallState;

6
include/MetroidPrime/BodyState/CBSGroundHit.hpp
View File

@@ -8,9 +8,9 @@ public:
CBSGroundHit();
~CBSGroundHit();
void Start(CBodyController& bc, CStateManager& mgr) override;
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override;
void Shutdown(CBodyController& bc) override;
void Start(CBodyController& bc, CStateManager& mgr);
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr);
void Shutdown(CBodyController& bc);
private:
float x4_rotateSpeed;

8
include/MetroidPrime/BodyState/CBSKnockBack.hpp
View File

@@ -8,10 +8,10 @@ public:
CBSKnockBack();
~CBSKnockBack();
void Start(CBodyController& bc, CStateManager& mgr) override;
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override;
void Shutdown(CBodyController&) override;
bool IsMoving() const override;
void Start(CBodyController& bc, CStateManager& mgr);
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr);
void Shutdown(CBodyController&);
bool IsMoving() const;
private:
float x4_curTime;

6
include/MetroidPrime/BodyState/CBSLieOnGround.hpp
View File

@@ -10,9 +10,9 @@ public:
explicit CBSLieOnGround(const CActor& actor);
~CBSLieOnGround();
void Start(CBodyController& bc, CStateManager& mgr) override;
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override;
void Shutdown(CBodyController& bc) override;
void Start(CBodyController& bc, CStateManager& mgr);
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr);
void Shutdown(CBodyController& bc);
private:
uint x4_24_hasGroundHit : 1;

8
include/MetroidPrime/BodyState/CBSLocomotion.hpp
View File

@@ -14,10 +14,10 @@ protected:
public:
bool IsMoving() const override = 0;
bool CanShoot() const override { return true; }
void Start(CBodyController& bc, CStateManager& mgr) override;
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override;
void Shutdown(CBodyController& bc) override;
bool CanShoot() const { return true; }
void Start(CBodyController& bc, CStateManager& mgr);
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr);
void Shutdown(CBodyController& bc);
virtual bool IsPitchable() const { return false; }
virtual float GetLocomotionSpeed(pas::ELocomotionType type, pas::ELocomotionAnim anim) const = 0;
virtual float ApplyLocomotionPhysics(float dt, CBodyController& bc);

8
include/MetroidPrime/BodyState/CBSLoopAttack.hpp
View File

@@ -7,10 +7,10 @@ class CBSLoopAttack : public CBodyState {
public:
CBSLoopAttack();
bool CanShoot() const override { return true; }
void Start(CBodyController& bc, CStateManager& mgr) override;
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override;
void Shutdown(CBodyController&) override;
bool CanShoot() const { return true; }
void Start(CBodyController& bc, CStateManager& mgr);
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr);
void Shutdown(CBodyController&);
pas::ELoopState GetState() const { return x4_state; }
pas::ELoopAttackType GetAttackType() const { return x8_loopAttackType; }

6
include/MetroidPrime/BodyState/CBSLoopReaction.hpp
View File

@@ -7,9 +7,9 @@ class CBSLoopReaction : public CBodyState {
public:
CBSLoopReaction();
void Start(CBodyController& bc, CStateManager& mgr) override;
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override;
void Shutdown(CBodyController&) override {}
void Start(CBodyController& bc, CStateManager& mgr);
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr);
void Shutdown(CBodyController&) {}
private:
pas::ELoopState x4_state;

8
include/MetroidPrime/BodyState/CBSProjectileAttack.hpp
View File

@@ -8,10 +8,10 @@ public:
CBSProjectileAttack();
~CBSProjectileAttack();
bool CanShoot() const override;
void Start(CBodyController& bc, CStateManager& mgr) override;
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override;
void Shutdown(CBodyController&) override;
bool CanShoot() const;
void Start(CBodyController& bc, CStateManager& mgr);
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr);
void Shutdown(CBodyController&);
private:
pas::EAnimationState GetBodyStateTransition(float dt, CBodyController& bc);

8
include/MetroidPrime/BodyState/CBSScripted.hpp
View File

@@ -8,10 +8,10 @@ public:
CBSScripted();
~CBSScripted();
bool ApplyHeadTracking() const override;
void Start(CBodyController& bc, CStateManager& mgr) override;
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override;
void Shutdown(CBodyController&) override;
bool ApplyHeadTracking() const;
void Start(CBodyController& bc, CStateManager& mgr);
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr);
void Shutdown(CBodyController&);
private:
bool x4_24_loopAnim : 1;

10
include/MetroidPrime/BodyState/CBSSlide.hpp
View File

@@ -10,11 +10,11 @@ public:
CBSSlide();
~CBSSlide();
bool ApplyHeadTracking() const override;
bool IsMoving() const override;
void Start(CBodyController& bc, CStateManager& mgr) override;
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override;
void Shutdown(CBodyController&) override;
bool ApplyHeadTracking() const;
bool IsMoving() const;
void Start(CBodyController& bc, CStateManager& mgr);
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr);
void Shutdown(CBodyController&);
private:
float x4_rotateSpeed;

10
include/MetroidPrime/BodyState/CBSStep.hpp
View File

@@ -8,11 +8,11 @@ public:
CBSStep();
~CBSStep();
void Start(CBodyController& bc, CStateManager& mgr) override;
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override;
void Shutdown(CBodyController&) override;
bool IsMoving() const override;
bool CanShoot() const override;
void Start(CBodyController& bc, CStateManager& mgr);
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr);
void Shutdown(CBodyController&);
bool IsMoving() const;
bool CanShoot() const;
private:
pas::EAnimationState GetBodyStateTransition(float dt, CBodyController& bc);

6
include/MetroidPrime/BodyState/CBSTaunt.hpp
View File

@@ -8,9 +8,9 @@ public:
CBSTaunt();
~CBSTaunt();
void Start(CBodyController& bc, CStateManager& mgr) override;
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override;
void Shutdown(CBodyController&) override;
void Start(CBodyController& bc, CStateManager& mgr);
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr);
void Shutdown(CBodyController&);
private:
pas::EAnimationState GetBodyStateTransition(float dt, CBodyController& bc);

14
include/MetroidPrime/BodyState/CBSTurn.hpp
View File

@@ -8,12 +8,12 @@
class CBSTurn : public CBodyState {
public:
CBSTurn();
~CBSTurn() override {}
~CBSTurn() {}
bool CanShoot() const override { return true; }
void Start(CBodyController& bc, CStateManager& mgr) override;
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override;
void Shutdown(CBodyController&) override;
bool CanShoot() const { return true; }
void Start(CBodyController& bc, CStateManager& mgr);
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr);
void Shutdown(CBodyController&);
protected:
float x4_rotateSpeed;
@@ -28,8 +28,8 @@ protected:
class CBSFlyerTurn : public CBSTurn {
public:
CBSFlyerTurn();
void Start(CBodyController& bc, CStateManager& mgr) override;
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override;
void Start(CBodyController& bc, CStateManager& mgr);
pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr);
};
#endif // _CBSTURN

2
include/MetroidPrime/BodyState/CBodyStateCmdMgr.hpp
View File

@@ -156,7 +156,7 @@ public:
CBCSlideCmd(pas::ESlideType type, const CVector3f& dir)
: CBodyStateCmd(kBSC_Slide), x8_type(type), xc_dir(dir) {}
~CBCSlideCmd() override {}
~CBCSlideCmd() {}
pas::ESlideType GetSlideType() const { return x8_type; }
const CVector3f& GetSlideDirection() const { return xc_dir; }

6
include/MetroidPrime/CActor.hpp
View File

@@ -56,10 +56,10 @@ public:
CActor(TUniqueId uid, bool active, const rstl::string& name, const CEntityInfo& info,
const CTransform4f& xf, const CModelData& mData, const CMaterialList& list,
const CActorParameters& params, TUniqueId nextDrawNode);
~CActor() override;
~CActor();
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
void SetActive(uchar active) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr);
void SetActive(const bool active);
virtual void PreRender(CStateManager&, const CFrustumPlanes&);
virtual void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const;

10
include/MetroidPrime/CAnimationDatabaseGame.hpp
View File

@@ -34,12 +34,12 @@ class CAnimationDatabaseGame : public CAnimationDatabase {
public:
explicit CAnimationDatabaseGame(const rstl::vector< CAnimation >& anims);
const rstl::rc_ptr< IMetaAnim >& GetMetaAnim(uint idx) const override;
uint GetNumMetaAnims() const override;
rstl::string GetMetaAnimName(uint idx) const override;
void GetAllUniquePrimitives(rstl::vector< CPrimitive >& primsOut) const override;
const rstl::rc_ptr< IMetaAnim >& GetMetaAnim(uint idx) const;
uint GetNumMetaAnims() const;
rstl::string GetMetaAnimName(uint idx) const;
void GetAllUniquePrimitives(rstl::vector< CPrimitive >& primsOut) const;
void GetUniquePrimitivesFromMetaAnim(rstl::set< CPrimitive >& primsOut,
const rstl::string& name) const override;
const rstl::string& name) const;
private:
rstl::vector< rstl::rc_ptr< IMetaAnim > > x10_anims;

4
include/MetroidPrime/CAudioStateWin.hpp
View File

@@ -9,8 +9,8 @@ class CAudioStateWin : public CIOWin {
public:
CAudioStateWin();
~CAudioStateWin() override;
EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override;
~CAudioStateWin();
EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&);
};
#endif // _CAUDIOSTATEWIN

26
include/MetroidPrime/CCollisionActor.hpp
View File

@@ -30,26 +30,26 @@ public:
float mass);
// CEntity
~CCollisionActor() override;
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
~CCollisionActor();
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr);
// CActor
CHealthInfo* HealthInfo(CStateManager&) override;
const CDamageVulnerability* GetDamageVulnerability() const override;
CHealthInfo* HealthInfo(CStateManager&);
const CDamageVulnerability* GetDamageVulnerability() const;
const CDamageVulnerability* GetDamageVulnerability(const CVector3f&, const CVector3f&,
const CDamageInfo&) const override;
rstl::optional_object< CAABox > GetTouchBounds() const override;
void Touch(CActor&, CStateManager&) override;
CVector3f GetOrbitPosition(const CStateManager&) const override;
CVector3f GetScanObjectIndicatorPosition(const CStateManager&) const override;
const CDamageInfo&) const;
rstl::optional_object< CAABox > GetTouchBounds() const;
void Touch(CActor&, CStateManager&);
CVector3f GetOrbitPosition(const CStateManager&) const;
CVector3f GetScanObjectIndicatorPosition(const CStateManager&) const;
EWeaponCollisionResponseTypes GetCollisionResponseType(const CVector3f&, const CVector3f&,
const CWeaponMode&,
int /*EProjectileAttrib?*/) const override;
void OnScanStateChange(EScanState, CStateManager&) override;
int /*EProjectileAttrib?*/) const;
void OnScanStateChange(EScanState, CStateManager&);
// CPhysicsActor
CTransform4f GetPrimitiveTransform() const override;
CTransform4f GetPrimitiveTransform() const;
private:
EPrimitiveType x258_primitiveType;

4
include/MetroidPrime/CConsoleOutputWindow.hpp
View File

@@ -12,8 +12,8 @@ class CConsoleOutputWindow : public CIOWin {
public:
CConsoleOutputWindow(int, float, float);
~CConsoleOutputWindow() override;
EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override;
~CConsoleOutputWindow();
EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&);
void Update(float);
void Draw() const;
private:

8
include/MetroidPrime/CCredits.hpp
View File

@@ -19,11 +19,11 @@ class CVector3f;
class CCredits : public CIOWin {
public:
CCredits();
~CCredits() override;
~CCredits();
EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override;
bool GetIsContinueDraw() const override;
void Draw() const override;
EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&);
bool GetIsContinueDraw() const;
void Draw() const;
EMessageReturn Update(float, CArchitectureQueue& queue);
EMessageReturn ProcessUserInput(const CFinalInput& input);

6
include/MetroidPrime/CEffect.hpp
View File

@@ -11,11 +11,11 @@ public:
const CTransform4f& xf);
// CEntity
~CEffect() override {}
~CEffect() {}
// CActor
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override;
void Render(const CStateManager&) const override;
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const;
void Render(const CStateManager&) const;
};
CHECK_SIZEOF(CEffect, 0xe8)

6
include/MetroidPrime/CEntity.hpp
View File

@@ -18,7 +18,7 @@ public:
virtual void PreThink(float dt, CStateManager& mgr);
virtual void Think(float dt, CStateManager& mgr);
virtual void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr);
virtual void SetActive(uchar active);
virtual void SetActive(const bool active);
CEntity(TUniqueId id, const CEntityInfo& info, bool active, const rstl::string& name);
@@ -32,7 +32,7 @@ public:
const rstl::string& GetDebugName() const { return x10_name; }
TAreaId GetAreaId() const;
TAreaId GetCurrentAreaId() const { return x4_areaId; }
uchar GetActive() const { return x30_24_active; }
const bool GetActive() const { return x30_24_active; }
bool IsScriptingBlocked() const { return x30_26_scriptingBlocked; }
// might be fake?
@@ -47,7 +47,7 @@ private:
TEditorId xc_editorId;
rstl::string x10_name;
rstl::vector< SConnection > x20_conns;
uchar x30_24_active : 1;
bool x30_24_active : 1;
bool x30_25_inGraveyard : 1;
bool x30_26_scriptingBlocked : 1;
bool x30_27_notInArea : 1;

8
include/MetroidPrime/CErrorOutputWindow.hpp
View File

@@ -8,11 +8,11 @@
class CErrorOutputWindow : public CIOWin {
public:
CErrorOutputWindow(bool);
~CErrorOutputWindow() override;
~CErrorOutputWindow();
EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override;
bool GetIsContinueDraw() const override;
void Draw() const override;
EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&);
bool GetIsContinueDraw() const;
void Draw() const;
void UpdateWindow();

16
include/MetroidPrime/CExplosion.hpp
View File

@@ -22,16 +22,16 @@ public:
const CVector3f& scale, const CColor& color);
// CEntity
~CExplosion() override;
void Accept(IVisitor& visitor) override;
void Think(float dt, CStateManager& mgr) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
~CExplosion();
void Accept(IVisitor& visitor);
void Think(float dt, CStateManager& mgr);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr);
// CActor
void PreRender(CStateManager&, const CFrustumPlanes&) override;
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override;
void Render(const CStateManager&) const override;
void CalculateRenderBounds() override;
void PreRender(CStateManager&, const CFrustumPlanes&);
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const;
void Render(const CStateManager&) const;
void CalculateRenderBounds();
public:
rstl::single_ptr< CParticleGen > xe8_particleGen;

12
include/MetroidPrime/CFlameWarp.hpp
View File

@@ -14,7 +14,7 @@ class CColor;
class CFlameWarp : public CWarp {
public:
CFlameWarp(float maxInfluenceDist, const CVector3f& warpPoint, bool collisionWarp);
~CFlameWarp() override;
~CFlameWarp();
const rstl::reserved_vector< CVector3f, 9 >& GetCollisionPoints() const {
return x4_collisionPoints;
@@ -26,14 +26,14 @@ public:
const CVector3f& GetFloatingPoint() const { return x80_floatingPoint; }
void SetMaxDistSq(float d) { x8c_maxDistSq = d; }
void SetStateManager(CStateManager& mgr) { x9c_stateMgr = &mgr; }
bool UpdateWarp() override;
bool UpdateWarp();
void ModifyParticles(int particleCount, int stripe, int*, CVector3f* particlePos,
CVector3f* particlePrevPos, CVector3f* particleVelocity,
CColor* color, float* lineLengthOrSize, float* lineWidthOrRota) override;
void Activate(bool val) override { xa0_24_activated = val; }
bool IsActivated() override;
CColor* color, float* lineLengthOrSize, float* lineWidthOrRota);
void Activate(bool val) { xa0_24_activated = val; }
bool IsActivated();
bool IsProcessed() const { return xa0_26_processed; }
FourCC Get4CharID() override;
FourCC Get4CharID();
void ResetPosition(const CVector3f& pos);
CAABox CalculateBounds() const;

16
include/MetroidPrime/CGameArea.hpp
View File

@@ -94,14 +94,14 @@ public:
};
~CGameArea();
const CTransform4f& IGetTM() const override;
CAssetId IGetStringTableAssetId() const override;
uint IGetNumAttachedAreas() const override;
TAreaId IGetAttachedAreaId(int) const override;
bool IIsActive() const override;
CAssetId IGetAreaAssetId() const override;
int IGetAreaSaveId() const override;
rstl::pair< rstl::auto_ptr< uchar >, int > IGetScriptingMemoryAlways() const override;
const CTransform4f& IGetTM() const;
CAssetId IGetStringTableAssetId() const;
uint IGetNumAttachedAreas() const;
TAreaId IGetAttachedAreaId(int) const;
bool IIsActive() const;
CAssetId IGetAreaAssetId() const;
int IGetAreaSaveId() const;
rstl::pair< rstl::auto_ptr< uchar >, int > IGetScriptingMemoryAlways() const;
TAreaId GetId() const { return x4_selfIdx; }
const CTransform4f& GetTM() const { return xc_transform; }

4
include/MetroidPrime/CGameLight.hpp
View File

@@ -14,8 +14,8 @@ public:
void SetLight(const CLight& light);
CLight GetLight() const;
void Think(float dt, CStateManager& mgr) override;
void Accept(IVisitor& visitor) override;
void Think(float dt, CStateManager& mgr);
void Accept(IVisitor& visitor);
void SetLightPriorityAndId();
private:

8
include/MetroidPrime/CMainFlow.hpp
View File

@@ -24,10 +24,10 @@ class CMainFlow : public CIOWin {
public:
CMainFlow();
~CMainFlow() override;
EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override;
bool GetIsContinueDraw() const override;
void Draw() const override;
~CMainFlow();
EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&);
bool GetIsContinueDraw() const;
void Draw() const;
void AdvanceGameState(CArchitectureQueue& queue);
void SetGameState(EClientFlowStates state, CArchitectureQueue& queue);

34
include/MetroidPrime/CParticleGenInfoGeneric.hpp
View File

@@ -14,23 +14,23 @@ public:
EParticleGenType state);
~CParticleGenInfoGeneric();
virtual void AddToRenderer() override;
virtual void Render() override;
virtual void Update(float dt, CStateManager& stateMgr) override;
virtual void SetOrientation(const CTransform4f& xf, CStateManager& stateMgr) override;
virtual void SetTranslation(const CVector3f& trans, CStateManager& stateMgr) override;
virtual void SetGlobalOrientation(const CTransform4f& xf, CStateManager& stateMgr) override;
virtual void SetGlobalTranslation(const CVector3f& trans, CStateManager& stateMgr) override;
virtual void SetGlobalScale(const CVector3f& scale) override;
virtual void SetParticleEmission(bool isActive, CStateManager& stateMgr) override;
virtual bool IsSystemDeletable() const override;
virtual rstl::optional_object<CAABox> GetBounds() const override;
virtual bool HasActiveParticles() const override;
virtual void DestroyParticles() override;
virtual bool HasLight() const override;
virtual TUniqueId GetLightId() const override;
virtual void DeleteLight(CStateManager& stateMgr) override;
virtual void SetModulationColor(const CColor& color) override;
virtual void AddToRenderer();
virtual void Render();
virtual void Update(float dt, CStateManager& stateMgr);
virtual void SetOrientation(const CTransform4f& xf, CStateManager& stateMgr);
virtual void SetTranslation(const CVector3f& trans, CStateManager& stateMgr);
virtual void SetGlobalOrientation(const CTransform4f& xf, CStateManager& stateMgr);
virtual void SetGlobalTranslation(const CVector3f& trans, CStateManager& stateMgr);
virtual void SetGlobalScale(const CVector3f& scale);
virtual void SetParticleEmission(bool isActive, CStateManager& stateMgr);
virtual bool IsSystemDeletable() const;
virtual rstl::optional_object<CAABox> GetBounds() const;
virtual bool HasActiveParticles() const;
virtual void DestroyParticles();
virtual bool HasLight() const;
virtual TUniqueId GetLightId() const;
virtual void DeleteLight(CStateManager& stateMgr);
virtual void SetModulationColor(const CColor& color);
const rstl::rc_ptr< CParticleGen >& GetParticleSystem() const { return x84_system; }

8
include/MetroidPrime/CPhysicsActor.hpp
View File

@@ -68,10 +68,10 @@ public:
float stepUp, float stepDown);
// CActor
~CPhysicsActor() override;
void Render(const CStateManager&) const override;
CVector3f GetOrbitPosition(const CStateManager& mgr) const override;
CVector3f GetAimPosition(const CStateManager& mgr, float val) const override;
~CPhysicsActor();
void Render(const CStateManager&) const;
CVector3f GetOrbitPosition(const CStateManager& mgr) const;
CVector3f GetAimPosition(const CStateManager& mgr, float val) const;
// CPhysicsActor
virtual const CCollisionPrimitive* GetCollisionPrimitive() const;

6
include/MetroidPrime/CSplashScreen.hpp
View File

@@ -15,9 +15,9 @@ public:
CSplashScreen(ESplashScreen);
~CSplashScreen() override;
EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override;
void Draw() const override;
~CSplashScreen();
EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&);
void Draw() const;
};
#endif // _CSPLASHSCREEN

22
include/MetroidPrime/CWorld.hpp
View File

@@ -64,17 +64,17 @@ enum EEnvFxType {
class CWorld : public IWorld {
public:
~CWorld();
CAssetId IGetWorldAssetId() const override;
CAssetId IGetStringTableAssetId() const override;
CAssetId IGetSaveWorldAssetId() const override;
const CMapWorld* IGetMapWorld() const override;
CMapWorld* IMapWorld() override;
const IGameArea* IGetAreaAlways(TAreaId id) const override;
TAreaId IGetCurrentAreaId() const override;
TAreaId IGetAreaId(CAssetId id) const override;
bool ICheckWorldComplete() override;
rstl::string IGetDefaultAudioTrack() const override;
int IGetAreaCount() const override;
CAssetId IGetWorldAssetId() const;
CAssetId IGetStringTableAssetId() const;
CAssetId IGetSaveWorldAssetId() const;
const CMapWorld* IGetMapWorld() const;
CMapWorld* IMapWorld();
const IGameArea* IGetAreaAlways(TAreaId id) const;
TAreaId IGetCurrentAreaId() const;
TAreaId IGetAreaId(CAssetId id) const;
bool ICheckWorldComplete();
rstl::string IGetDefaultAudioTrack() const;
int IGetAreaCount() const;
void SetLoadPauseState(bool);
void TouchSky() const;

14
include/MetroidPrime/Cameras/CBallCamera.hpp
View File

@@ -99,17 +99,17 @@ public:
float farZ, float aspect);
// CEntity
~CBallCamera() override;
void Accept(IVisitor& visitor) override;
void Think(float dt, CStateManager& mgr) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
~CBallCamera();
void Accept(IVisitor& visitor);
void Think(float dt, CStateManager& mgr);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr);
// CActor
void Render(const CStateManager&) const override;
void Render(const CStateManager&) const;
// CGameCamera
void ProcessInput(const CFinalInput&, CStateManager& mgr) override;
void Reset(const CTransform4f&, CStateManager& mgr) override;
void ProcessInput(const CFinalInput&, CStateManager& mgr);
void Reset(const CTransform4f&, CStateManager& mgr);
// CBallCamera
void SetupColliders(rstl::vector< CCameraCollider >& out, float xMag, float zMag, float radius,

10
include/MetroidPrime/Cameras/CCinematicCamera.hpp
View File

@@ -12,14 +12,14 @@ public:
float zfar, float aspect, uint flags);
~CCinematicCamera();
// CActor
void Accept(IVisitor& visitor) override;
void Think(float dt, CStateManager& mgr) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
void Accept(IVisitor& visitor);
void Think(float dt, CStateManager& mgr);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr);
// CGameCamera
void ProcessInput(const CFinalInput&, CStateManager& mgr) override;
void Reset(const CTransform4f&, CStateManager& mgr) override;
void ProcessInput(const CFinalInput&, CStateManager& mgr);
void Reset(const CTransform4f&, CStateManager& mgr);
// CCinematicCamera
u32 GetFlags() const { return x21c_flags; }

8
include/MetroidPrime/Cameras/CGameCamera.hpp
View File

@@ -17,10 +17,10 @@ public:
TUniqueId watchedId, bool disableInput, int controllerIdx);
// CEntity
~CGameCamera() override;
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
void SetActive(uchar active) override;
~CGameCamera();
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr);
void SetActive(const bool active);
// CGameCamera
virtual void ProcessInput(const CFinalInput&, CStateManager& mgr) = 0;

4
include/MetroidPrime/Cameras/CInterpolationCamera.hpp
View File

@@ -7,8 +7,8 @@ class CInterpolationCamera : public CGameCamera {
public:
CInterpolationCamera(TUniqueId uid, const CTransform4f& xf);
// CGameCamera
void ProcessInput(const CFinalInput&, CStateManager& mgr) override;
void Reset(const CTransform4f&, CStateManager& mgr) override;
void ProcessInput(const CFinalInput&, CStateManager& mgr);
void Reset(const CTransform4f&, CStateManager& mgr);
private:
TUniqueId x188_targetId;
float x18c_time;

10
include/MetroidPrime/Enemies/CAi.hpp
View File

@@ -20,13 +20,13 @@ public:
// const CStateMachine* GetStateMachine() const;
~CAi();
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
CHealthInfo* HealthInfo(CStateManager&) override;
const CDamageVulnerability* GetDamageVulnerability() const override { return nullptr; }
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
CHealthInfo* HealthInfo(CStateManager&);
const CDamageVulnerability* GetDamageVulnerability() const { return nullptr; }
EWeaponCollisionResponseTypes GetCollisionResponseType(const CVector3f&, const CVector3f&,
const CWeaponMode&,
int) const override;
void FluidFXThink(EFluidState, CScriptWater&, CStateManager&) override;
int) const;
void FluidFXThink(EFluidState, CScriptWater&, CStateManager&);
;
virtual void Death(CStateManager& mgr, const CVector3f& direction, EScriptObjectState state) = 0;

14
include/MetroidPrime/Enemies/CFlaahgraPlants.hpp
View File

@@ -16,15 +16,15 @@ public:
TUniqueId, const CTransform4f&, const CDamageInfo&, const CVector3f&);
// CEntity
~CFlaahgraPlants() override;
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CStateManager& mgr) override;
void Think(float dt, CStateManager& mgr) override;
~CFlaahgraPlants();
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CStateManager& mgr);
void Think(float dt, CStateManager& mgr);
// CActor
void AddToRenderer(const CFrustumPlanes& frustum, const CStateManager& mgr) const override;
rstl::optional_object< CAABox > GetTouchBounds() const override;
void Touch(CActor& actor, CStateManager& mgr) override;
void AddToRenderer(const CFrustumPlanes& frustum, const CStateManager& mgr) const;
rstl::optional_object< CAABox > GetTouchBounds() const;
void Touch(CActor& actor, CStateManager& mgr);
private:
rstl::auto_ptr< CElementGen > xe8_elementGen;

32
include/MetroidPrime/Enemies/CMetaree.hpp
View File

@@ -17,31 +17,31 @@ public:
float f3, float f4, const CActorParameters& aParms);
// CEntity
void Accept(IVisitor& visitor) override;
void Think(float dt, CStateManager& mgr) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
void Accept(IVisitor& visitor);
void Think(float dt, CStateManager& mgr);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr);
// CActor
void Touch(CActor&, CStateManager&) override;
void Touch(CActor&, CStateManager&);
// CPhysicsActor
void CollidedWith(const TUniqueId& id, const CCollisionInfoList& list,
CStateManager& mgr) override;
CStateManager& mgr);
// CAi
void Dead(CStateManager&, EStateMsg, float) override;
void Halt(CStateManager&, EStateMsg, float) override;
void Attack(CStateManager&, EStateMsg, float) override;
void Active(CStateManager&, EStateMsg, float) override;
void InActive(CStateManager&, EStateMsg, float) override;
void Flee(CStateManager&, EStateMsg, float) override;
void Explode(CStateManager&, EStateMsg, float) override;
bool InRange(CStateManager&, float) override;
bool Delay(CStateManager&, float) override;
bool ShouldAttack(CStateManager&, float) override;
void Dead(CStateManager&, EStateMsg, float);
void Halt(CStateManager&, EStateMsg, float);
void Attack(CStateManager&, EStateMsg, float);
void Active(CStateManager&, EStateMsg, float);
void InActive(CStateManager&, EStateMsg, float);
void Flee(CStateManager&, EStateMsg, float);
void Explode(CStateManager&, EStateMsg, float);
bool InRange(CStateManager&, float);
bool Delay(CStateManager&, float);
bool ShouldAttack(CStateManager&, float);
// CPatterned
void ThinkAboutMove(float) override;
void ThinkAboutMove(float);
private:
float x568_delay;

6
include/MetroidPrime/Enemies/CMetroidPrimeProjectile.hpp
View File

@@ -42,12 +42,12 @@ public:
bool sendCollideMsg);
// CEntity
~CMetroidPrimeProjectile() override;
void Accept(IVisitor& visitor) override;
~CMetroidPrimeProjectile();
void Accept(IVisitor& visitor);
// CEnergyProjectile
bool Explode(const CVector3f& pos, const CVector3f& normal, EWeaponCollisionResponseTypes type,
CStateManager& mgr, const CDamageVulnerability& dVuln, TUniqueId hitActor) override;
CStateManager& mgr, const CDamageVulnerability& dVuln, TUniqueId hitActor);
};
#endif // _CMETROIDPRIMEPROJECTILE

34
include/MetroidPrime/Enemies/CNewIntroBoss.hpp
View File

@@ -19,30 +19,30 @@ public:
CAssetId beamTextureId, CAssetId beamGlowTextureId);
// CEntity
void Accept(IVisitor& visitor) override;
void Think(float dt, CStateManager& mgr) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
void Accept(IVisitor& visitor);
void Think(float dt, CStateManager& mgr);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr);
// CActor
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override;
rstl::optional_object< CAABox > GetTouchBounds() const override;
void OnScanStateChange(EScanState, CStateManager&) override;
CAABox GetSortingBounds(const CStateManager&) const override;
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const;
rstl::optional_object< CAABox > GetTouchBounds() const;
void OnScanStateChange(EScanState, CStateManager&);
CAABox GetSortingBounds(const CStateManager&) const;
void DoUserAnimEvent(CStateManager& mgr, const CInt32POINode& node, EUserEventType type,
float dt) override;
float dt);
// CAi
void Patrol(CStateManager&, EStateMsg, float) override;
void Generate(CStateManager& mgr, EStateMsg msg, float arg) override;
void Attack(CStateManager&, EStateMsg, float) override;
bool InAttackPosition(CStateManager&, float) override;
bool AnimOver(CStateManager&, float) override;
bool ShouldAttack(CStateManager&, float) override;
bool ShouldTurn(CStateManager&, float) override;
bool AIStage(CStateManager&, float) override;
void Patrol(CStateManager&, EStateMsg, float);
void Generate(CStateManager& mgr, EStateMsg msg, float arg);
void Attack(CStateManager&, EStateMsg, float);
bool InAttackPosition(CStateManager&, float);
bool AnimOver(CStateManager&, float);
bool ShouldAttack(CStateManager&, float);
bool ShouldTurn(CStateManager&, float);
bool AIStage(CStateManager&, float);
// CPatterned
CProjectileInfo* ProjectileInfo() override;
CProjectileInfo* ProjectileInfo();
pas::ELocomotionType GetLocoForHealth(const CStateManager& mgr) const;
pas::EGenerateType GetGenerateForHealth(const CStateManager& mgr) const;

112
include/MetroidPrime/Enemies/CPatterned.hpp
View File

@@ -151,73 +151,73 @@ public:
EBodyType body, const CActorParameters& params, EKnockBackVariant kbVariant);
// CEntity
~CPatterned() override;
void Accept(IVisitor& visitor) override;
void PreThink(float dt, CStateManager& mgr) override;
void Think(float dt, CStateManager& mgr) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
~CPatterned();
void Accept(IVisitor& visitor);
void PreThink(float dt, CStateManager& mgr);
void Think(float dt, CStateManager& mgr);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
// CActor
void PreRender(CStateManager&, const CFrustumPlanes&) override;
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override;
void Render(const CStateManager&) const override;
bool CanRenderUnsorted(const CStateManager&) const override;
rstl::optional_object< CAABox > GetTouchBounds() const override;
void Touch(CActor&, CStateManager&) override;
CVector3f GetOrbitPosition(const CStateManager&) const override;
CVector3f GetAimPosition(const CStateManager&, float) const override;
void PreRender(CStateManager&, const CFrustumPlanes&);
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const;
void Render(const CStateManager&) const;
bool CanRenderUnsorted(const CStateManager&) const;
rstl::optional_object< CAABox > GetTouchBounds() const;
void Touch(CActor&, CStateManager&);
CVector3f GetOrbitPosition(const CStateManager&) const;
CVector3f GetAimPosition(const CStateManager&, float) const;
EWeaponCollisionResponseTypes GetCollisionResponseType(const CVector3f&, const CVector3f&,
const CWeaponMode&,
int /*EProjectileAttrib?*/) const override;
int /*EProjectileAttrib?*/) const;
void DoUserAnimEvent(CStateManager& mgr, const CInt32POINode& node, EUserEventType type,
float dt) override;
float dt);
// CPhysicsActor
void CollidedWith(const TUniqueId& id, const CCollisionInfoList& list,
CStateManager& mgr) override;
CStateManager& mgr);
// CAi
void Death(CStateManager& mgr, const CVector3f& direction, EScriptObjectState state) override;
void Death(CStateManager& mgr, const CVector3f& direction, EScriptObjectState state);
void KnockBack(const CVector3f&, CStateManager&, const CDamageInfo& info, EKnockBackType type,
bool inDeferred, float magnitude) override;
void TakeDamage(const CVector3f& direction, float magnitude) override;
void Patrol(CStateManager&, EStateMsg, float) override;
void FollowPattern(CStateManager&, EStateMsg, float) override;
void Dead(CStateManager&, EStateMsg, float) override;
void PathFind(CStateManager&, EStateMsg, float) override;
void Start(CStateManager&, EStateMsg, float) override;
void TargetPatrol(CStateManager&, EStateMsg, float) override;
void TargetPlayer(CStateManager&, EStateMsg, float) override;
bool Leash(CStateManager&, float) override;
bool OffLine(CStateManager&, float) override;
bool Attacked(CStateManager&, float) override;
bool PathShagged(CStateManager&, float) override;
bool PathOver(CStateManager&, float) override;
bool PathFound(CStateManager&, float) override;
bool TooClose(CStateManager&, float) override;
bool InRange(CStateManager&, float) override;
bool InMaxRange(CStateManager&, float) override;
bool InDetectionRange(CStateManager&, float) override;
bool SpotPlayer(CStateManager&, float) override;
bool PlayerSpot(CStateManager&, float) override;
bool PatternOver(CStateManager&, float) override;
bool PatternShagged(CStateManager&, float) override;
bool HasAttackPattern(CStateManager&, float) override;
bool HasPatrolPath(CStateManager&, float) override;
bool HasRetreatPattern(CStateManager&, float) override;
bool Delay(CStateManager&, float) override;
bool RandomDelay(CStateManager&, float) override;
bool FixedDelay(CStateManager&, float) override;
bool Default(CStateManager&, float) override;
bool AnimOver(CStateManager&, float) override;
bool InPosition(CStateManager&, float) override;
bool Stuck(CStateManager&, float) override;
bool NoPathNodes(CStateManager&, float) override;
bool Landed(CStateManager&, float) override;
bool PatrolPathOver(CStateManager&, float) override;
bool CodeTrigger(CStateManager&, float) override;
bool Random(CStateManager&, float) override;
bool FixedRandom(CStateManager&, float) override;
bool inDeferred, float magnitude);
void TakeDamage(const CVector3f& direction, float magnitude);
void Patrol(CStateManager&, EStateMsg, float);
void FollowPattern(CStateManager&, EStateMsg, float);
void Dead(CStateManager&, EStateMsg, float);
void PathFind(CStateManager&, EStateMsg, float);
void Start(CStateManager&, EStateMsg, float);
void TargetPatrol(CStateManager&, EStateMsg, float);
void TargetPlayer(CStateManager&, EStateMsg, float);
bool Leash(CStateManager&, float);
bool OffLine(CStateManager&, float);
bool Attacked(CStateManager&, float);
bool PathShagged(CStateManager&, float);
bool PathOver(CStateManager&, float);
bool PathFound(CStateManager&, float);
bool TooClose(CStateManager&, float);
bool InRange(CStateManager&, float);
bool InMaxRange(CStateManager&, float);
bool InDetectionRange(CStateManager&, float);
bool SpotPlayer(CStateManager&, float);
bool PlayerSpot(CStateManager&, float);
bool PatternOver(CStateManager&, float);
bool PatternShagged(CStateManager&, float);
bool HasAttackPattern(CStateManager&, float);
bool HasPatrolPath(CStateManager&, float);
bool HasRetreatPattern(CStateManager&, float);
bool Delay(CStateManager&, float);
bool RandomDelay(CStateManager&, float);
bool FixedDelay(CStateManager&, float);
bool Default(CStateManager&, float);
bool AnimOver(CStateManager&, float);
bool InPosition(CStateManager&, float);
bool Stuck(CStateManager&, float);
bool NoPathNodes(CStateManager&, float);
bool Landed(CStateManager&, float);
bool PatrolPathOver(CStateManager&, float);
bool CodeTrigger(CStateManager&, float);
bool Random(CStateManager&, float);
bool FixedRandom(CStateManager&, float);
// CPatterned
virtual void Freeze(CStateManager& mgr, const CVector3f& pos, const CUnitVector3f& dir,

14
include/MetroidPrime/Enemies/CPuffer.hpp
View File

@@ -17,13 +17,13 @@ public:
const CDamageInfo& cloudDamage, CAssetId cloudSteam, float f2, bool b1, bool b2, bool b3,
const CDamageInfo& explosionDamage, ushort sfxId);
~CPuffer() override;
void Accept(IVisitor&) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void Think(float, CStateManager&) override;
rstl::optional_object< CAABox > GetTouchBounds() const override;
void Touch(CActor&, CStateManager&) override;
void Death(CStateManager&, const CVector3f&, EScriptObjectState) override;
~CPuffer();
void Accept(IVisitor&);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void Think(float, CStateManager&);
rstl::optional_object< CAABox > GetTouchBounds() const;
void Touch(CActor&, CStateManager&);
void Death(CStateManager&, const CVector3f&, EScriptObjectState);
private:
CVector3f x568_face;

2
include/MetroidPrime/Enemies/CRipperControlledPlatform.hpp
View File

@@ -11,7 +11,7 @@ public:
const CAABox&, bool, const rstl::optional_object< TLockedToken< CCollidableOBBTreeGroupContainer > >&);
~CRipperControlledPlatform();
CQuaternion Move(float, CStateManager&) override;
CQuaternion Move(float, CStateManager&);
private:
TUniqueId x358_owner;

14
include/MetroidPrime/GameObjectLists.hpp
View File

@@ -6,37 +6,37 @@
class CActorList : public CObjectList {
public:
CActorList();
uchar IsQualified(const CEntity& ent) override;
uchar IsQualified(const CEntity& ent);
};
class CPhysicsActorList : public CObjectList {
public:
CPhysicsActorList();
uchar IsQualified(const CEntity& ent) override;
uchar IsQualified(const CEntity& ent);
};
class CGameCameraList : public CObjectList {
public:
CGameCameraList();
uchar IsQualified(const CEntity& ent) override;
uchar IsQualified(const CEntity& ent);
};
class CListeningAiList : public CObjectList {
public:
CListeningAiList();
uchar IsQualified(const CEntity& ent) override;
uchar IsQualified(const CEntity& ent);
};
class CAiWaypointList : public CObjectList {
public:
CAiWaypointList();
uchar IsQualified(const CEntity& ent) override;
uchar IsQualified(const CEntity& ent);
};
class CPlatformAndDoorList : public CObjectList {
public:
CPlatformAndDoorList();
uchar IsQualified(const CEntity& ent) override;
uchar IsQualified(const CEntity& ent);
static uchar IsPlatform(const CEntity* ent);
static uchar IsDoor(const CEntity*);
};
@@ -44,7 +44,7 @@ public:
class CGameLightList : public CObjectList {
public:
CGameLightList();
uchar IsQualified(const CEntity& ent) override;
uchar IsQualified(const CEntity& ent);
};

48
include/MetroidPrime/Player/CPlayer.hpp
View File

@@ -143,36 +143,36 @@ public:
};
// CEntity
~CPlayer() override;
void Accept(IVisitor& visitor) override;
void PreThink(float dt, CStateManager& mgr) override;
void Think(float dt, CStateManager& mgr) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
~CPlayer();
void Accept(IVisitor& visitor);
void PreThink(float dt, CStateManager& mgr);
void Think(float dt, CStateManager& mgr);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr);
// CActor
void PreRender(CStateManager&, const CFrustumPlanes&) override;
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override;
void Render(const CStateManager&) const override;
bool CanRenderUnsorted(const CStateManager&) const override;
void CalculateRenderBounds() override;
CHealthInfo* HealthInfo(CStateManager&) override;
const CDamageVulnerability* GetDamageVulnerability() const override;
void PreRender(CStateManager&, const CFrustumPlanes&);
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const;
void Render(const CStateManager&) const;
bool CanRenderUnsorted(const CStateManager&) const;
void CalculateRenderBounds();
CHealthInfo* HealthInfo(CStateManager&);
const CDamageVulnerability* GetDamageVulnerability() const;
const CDamageVulnerability* GetDamageVulnerability(const CVector3f&, const CVector3f&,
const CDamageInfo&) const override;
rstl::optional_object< CAABox > GetTouchBounds() const override;
void Touch(CActor&, CStateManager&) override;
CVector3f GetAimPosition(const CStateManager&, float) const override;
CVector3f GetHomingPosition(const CStateManager&, float) const override;
void FluidFXThink(EFluidState, CScriptWater&, CStateManager&) override;
const CDamageInfo&) const;
rstl::optional_object< CAABox > GetTouchBounds() const;
void Touch(CActor&, CStateManager&);
CVector3f GetAimPosition(const CStateManager&, float) const;
CVector3f GetHomingPosition(const CStateManager&, float) const;
void FluidFXThink(EFluidState, CScriptWater&, CStateManager&);
// CPhysicsActor
const CCollisionPrimitive* GetCollisionPrimitive() const override;
CTransform4f GetPrimitiveTransform() const override;
const CCollisionPrimitive* GetCollisionPrimitive() const;
CTransform4f GetPrimitiveTransform() const;
void CollidedWith(const TUniqueId& id, const CCollisionInfoList& list,
CStateManager& mgr) override;
float GetStepDownHeight() const override;
float GetStepUpHeight() const override;
float GetWeight() const override;
CStateManager& mgr);
float GetStepDownHeight() const;
float GetStepUpHeight() const;
float GetWeight() const;
// CPlayer
virtual bool IsTransparent();

14
include/MetroidPrime/ScriptObjects/CFire.hpp
View File

@@ -18,15 +18,15 @@ public:
float f2, float f3, float f4);
// CEntity
~CFire() override;
void Accept(IVisitor& visitor) override;
void Think(float dt, CStateManager& mgr) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
~CFire();
void Accept(IVisitor& visitor);
void Think(float dt, CStateManager& mgr);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr);
// CActor
void Render(const CStateManager&) const override;
rstl::optional_object< CAABox > GetTouchBounds() const override;
void Touch(CActor&, CStateManager&) override;
void Render(const CStateManager&) const;
rstl::optional_object< CAABox > GetTouchBounds() const;
void Touch(CActor&, CStateManager&);
private:
rstl::single_ptr< CElementGen > xe8_;

12
include/MetroidPrime/ScriptObjects/CHUDBillboardEffect.hpp
View File

@@ -14,13 +14,13 @@ public:
TUniqueId uid, bool active, const rstl::string& name, float dist,
const CVector3f& scale0, const CColor& color, const CVector3f& scale1,
const CVector3f& translation);
~CHUDBillboardEffect() override;
~CHUDBillboardEffect();
void Accept(IVisitor& visitor) override;
void Think(float dt, CStateManager& mgr) override;
void PreRender(CStateManager& mgr, const CFrustumPlanes& frustum) override;
void AddToRenderer(const CFrustumPlanes& frustum, const CStateManager& mgr) const override;
void Render(const CStateManager& mgr) const override;
void Accept(IVisitor& visitor);
void Think(float dt, CStateManager& mgr);
void PreRender(CStateManager& mgr, const CFrustumPlanes& frustum);
void AddToRenderer(const CFrustumPlanes& frustum, const CStateManager& mgr) const;
void Render(const CStateManager& mgr) const;
bool IsElementGen() const { return x104_26_isElementGen; }
void SetRunIndefinitely(bool b) { x104_27_runIndefinitely = b; }
CParticleGen* GetParticleGen() const { return xe8_generator.get(); }

4
include/MetroidPrime/ScriptObjects/CRepulsor.hpp
View File

@@ -9,8 +9,8 @@ class CRepulsor : public CActor {
public:
CRepulsor(TUniqueId, bool, const rstl::string&, const CEntityInfo&, const CVector3f&, float);
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
float GetAffectRadius() const { return xe8_affectRadius; }
};

22
include/MetroidPrime/ScriptObjects/CScriptActor.hpp
View File

@@ -19,23 +19,23 @@ public:
bool scaleAdvancementDelta, bool materialFlag54);
// CEntity
~CScriptActor() override;
void Accept(IVisitor& visitor) override;
void Think(float dt, CStateManager& mgr) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
~CScriptActor();
void Accept(IVisitor& visitor);
void Think(float dt, CStateManager& mgr);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr);
// CActor
void PreRender(CStateManager&, const CFrustumPlanes&) override;
CHealthInfo* HealthInfo(CStateManager&) override;
const CDamageVulnerability* GetDamageVulnerability() const override;
rstl::optional_object< CAABox > GetTouchBounds() const override;
void Touch(CActor&, CStateManager&) override;
void PreRender(CStateManager&, const CFrustumPlanes&);
CHealthInfo* HealthInfo(CStateManager&);
const CDamageVulnerability* GetDamageVulnerability() const;
rstl::optional_object< CAABox > GetTouchBounds() const;
void Touch(CActor&, CStateManager&);
// CPhysicsActor
EWeaponCollisionResponseTypes GetCollisionResponseType(const CVector3f&, const CVector3f&,
const CWeaponMode&,
int) const override;
CAABox GetSortingBounds(const CStateManager&) const override;
int) const;
CAABox GetSortingBounds(const CStateManager&) const;
bool IsPlayerActor() const { return x2e3_24_isPlayerActor; }

6
include/MetroidPrime/ScriptObjects/CScriptActorKeyframe.hpp
View File

@@ -10,9 +10,9 @@ public:
bool looping, float lifetime, bool isPassive, int fadeOut, bool active,
float totalPlayback);
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
void Think(float, CStateManager&) override;
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);
void Think(float, CStateManager&);
void UpdateEntity(TUniqueId, CStateManager&);
bool IsPassive() const { return x44_25_isPassive; }
void SetIsPassive(bool b) { x44_25_isPassive = b; }

6
include/MetroidPrime/ScriptObjects/CScriptActorRotate.hpp
View File

@@ -14,9 +14,9 @@ public:
bool, bool, bool);
~CScriptActorRotate();
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void Think(float, CStateManager&) override;
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void Think(float, CStateManager&);
private:
CVector3f x34_rotation;

12
include/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.hpp
View File

@@ -18,12 +18,12 @@ public:
float);
~CScriptAiJumpPoint();
void Accept(IVisitor& visitor) override;
void Think(float, CStateManager&) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override;
void Render(const CStateManager&) const override;
rstl::optional_object< CAABox > GetTouchBounds() const override;
void Accept(IVisitor& visitor);
void Think(float, CStateManager&);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const;
void Render(const CStateManager&) const;
rstl::optional_object< CAABox > GetTouchBounds() const;
bool GetInUse(TUniqueId uid) const;
TUniqueId GetJumpPoint() const { return x10c_currentWaypoint; }
TUniqueId GetJumpTarget() const { return x10e_nextWaypoint; }

4
include/MetroidPrime/ScriptObjects/CScriptAreaAttributes.hpp
View File

@@ -20,8 +20,8 @@ public:
float thermalHeat, float xrayFogDistance, float worldLightingLevel, CAssetId skybox,
EPhazonType phazonType);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);
void Accept(IVisitor& visitor);
~CScriptAreaAttributes();
bool GetNeedsSky() const { return x34_24_showSkybox; }

10
include/MetroidPrime/ScriptObjects/CScriptBallTrigger.hpp
View File

@@ -9,11 +9,11 @@ public:
const CVector3f&, bool, float, float, float, const CVector3f&, bool);
~CScriptBallTrigger();
void Accept(IVisitor&) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void Think(float, CStateManager& mgr) override;
void InhabitantAdded(CActor&, CStateManager&) override;
void InhabitantExited(CActor&, CStateManager&) override;
void Accept(IVisitor&);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void Think(float, CStateManager& mgr);
void InhabitantAdded(CActor&, CStateManager&);
void InhabitantExited(CActor&, CStateManager&);
private:
float x150_force;

6
include/MetroidPrime/ScriptObjects/CScriptBeam.hpp
View File

@@ -18,9 +18,9 @@ public:
const TToken< CWeaponDescription >&, const CBeamInfo&, const CDamageInfo&);
~CScriptBeam();
void Accept(IVisitor& visitor) override;
void Think(float, CStateManager&) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void Accept(IVisitor& visitor);
void Think(float, CStateManager&);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
};
#endif // _CSCRIPTBEAM

4
include/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.hpp
View File

@@ -18,8 +18,8 @@ public:
float timeOut, bool active);
~CScriptCameraBlurKeyframe();
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);
};
#endif // _CSCRIPTCAMERABLURKEYFRAME

4
include/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.hpp
View File

@@ -26,8 +26,8 @@ public:
float timeOut, CAssetId txtr, bool active);
~CScriptCameraFilterKeyframe();
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);
void Accept(IVisitor& visitor);
};
#endif // _CSCRIPTCAMERAFILTERKEYFRAME

8
include/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.hpp
View File

@@ -19,10 +19,10 @@ public:
bool deactivateOnEnter, bool deactivateOnExit);
~CScriptCameraHintTrigger();
void Accept(IVisitor& visitor) override;
void Think(float dt, CStateManager& mgr) override;
void Touch(CActor& other, CStateManager& mgr) override;
rstl::optional_object< CAABox > GetTouchBounds() const override;
void Accept(IVisitor& visitor);
void Think(float dt, CStateManager& mgr);
void Touch(CActor& other, CStateManager& mgr);
rstl::optional_object< CAABox > GetTouchBounds() const;
};
#endif // _CSCRIPTCAMERAHINTTRIGGER

8
include/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.hpp
View File

@@ -13,10 +13,10 @@ public:
const CRelAngle&, float);
~CScriptCameraPitchVolume();
void Accept(IVisitor& visitor) override;
void Think(float, CStateManager&) override;
rstl::optional_object< CAABox > GetTouchBounds() const override;
void Touch(CActor&, CStateManager&) override;
void Accept(IVisitor& visitor);
void Think(float, CStateManager&);
rstl::optional_object< CAABox > GetTouchBounds() const;
void Touch(CActor&, CStateManager&);
// float GetUpPitch() const { return x124_upPitch; }
// float GetDownPitch() const { return x128_downPitch; }
// const CVector3f& GetScale() const { return x12c_scale; }

4
include/MetroidPrime/ScriptObjects/CScriptCameraShaker.hpp
View File

@@ -13,8 +13,8 @@ public:
const CCameraShakeData& shakeData);
~CScriptCameraShaker();
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);
};
#endif // _CSCRIPTCAMERASHAKER

8
include/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.hpp
View File

@@ -12,10 +12,10 @@ public:
const CTransform4f& xf, bool active, float hfov, uint);
~CScriptCameraWaypoint();
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override;
void Render(const CStateManager&) const override;
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const;
void Render(const CStateManager&) const;
TUniqueId GetRandomNextWaypointId(const CStateManager& mgr) const;
float GetHFov() const { return xe8_hfov; }

4
include/MetroidPrime/ScriptObjects/CScriptControllerAction.hpp
View File

@@ -84,8 +84,8 @@ public:
CScriptControllerAction(TUniqueId uid, const rstl::string& name, const CEntityInfo& info,
bool active, ECommands command, bool b1, uint w1, bool b2);
void Accept(IVisitor& visitor) override;
void Think(float, CStateManager&) override;
void Accept(IVisitor& visitor);
void Think(float, CStateManager&);
static ControlMapper::ECommands GetCommand(ECommands cmd);
};

4
include/MetroidPrime/ScriptObjects/CScriptCounter.hpp
View File

@@ -13,8 +13,8 @@ public:
CScriptCounter(TUniqueId, const rstl::string& name, const CEntityInfo& info, int, int, bool, bool);
~CScriptCounter();
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);
void Accept(IVisitor& visitor);
};
#endif // _CSCRIPTCOUNTER

12
include/MetroidPrime/ScriptObjects/CScriptCoverPoint.hpp
View File

@@ -11,12 +11,12 @@ public:
const CTransform4f& xf, bool active, uint flags, bool crouch, float horizontalAngle,
float verticalAngle, float coverTime);
void Accept(IVisitor& visitor) override;
void Think(float, CStateManager&) override;
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override;
void Render(const CStateManager&) const override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
rstl::optional_object< CAABox > GetTouchBounds() const override;
void Accept(IVisitor& visitor);
void Think(float, CStateManager&);
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const;
void Render(const CStateManager&) const;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
rstl::optional_object< CAABox > GetTouchBounds() const;
bool ShouldCrouch() const;
bool ShouldStay() const;

20
include/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.hpp
View File

@@ -24,18 +24,18 @@ public:
CAssetId colorTex, ECanOrbit canOrbit, bool active,
const CVisorParameters& vParams);
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
EWeaponCollisionResponseTypes GetCollisionResponseType(const CVector3f&, const CVector3f&,
const CWeaponMode&,
int /*EProjectileAttrib?*/) const override;
void Render(const CStateManager& mgr) const override;
void AddToRenderer(const CFrustumPlanes& frustum, const CStateManager& mgr) const override;
void PreRender(CStateManager& mgr, const CFrustumPlanes& frustum) override;
const CDamageVulnerability* GetDamageVulnerability() const override { return &x174_dVuln; }
CHealthInfo* HealthInfo(CStateManager&) override { return &x16c_hInfo; }
void Think(float, CStateManager&) override;
rstl::optional_object< CAABox > GetTouchBounds() const override;
int /*EProjectileAttrib?*/) const;
void Render(const CStateManager& mgr) const;
void AddToRenderer(const CFrustumPlanes& frustum, const CStateManager& mgr) const;
void PreRender(CStateManager& mgr, const CFrustumPlanes& frustum);
const CDamageVulnerability* GetDamageVulnerability() const { return &x174_dVuln; }
CHealthInfo* HealthInfo(CStateManager&) { return &x16c_hInfo; }
void Think(float, CStateManager&);
rstl::optional_object< CAABox > GetTouchBounds() const;
private:
CFrustumPlanes xe8_frustum;

4
include/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.hpp
View File

@@ -9,9 +9,9 @@ class CScriptDebugCameraWaypoint : public CActor {
public:
CScriptDebugCameraWaypoint(TUniqueId uid, const rstl::string& name, const CEntityInfo& info,
const CTransform4f& xf, uint value);
~CScriptDebugCameraWaypoint() override;
~CScriptDebugCameraWaypoint();
void Accept(IVisitor& visitor) override;
void Accept(IVisitor& visitor);
private:
uint xe8_value;

4
include/MetroidPrime/ScriptObjects/CScriptDistanceFog.hpp
View File

@@ -25,8 +25,8 @@ public:
float);
~CScriptDistanceFog();
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);
};
#endif // _CSCRIPTDISTANCEFOG

10
include/MetroidPrime/ScriptObjects/CScriptDock.hpp
View File

@@ -11,11 +11,11 @@ public:
void SetDockReference(CStateManager& mgr, int);
void Accept(IVisitor& visitor) override;
void Think(float, CStateManager&) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
rstl::optional_object< CAABox > GetTouchBounds() const override;
void Touch(CActor&, CStateManager&) override;
void Accept(IVisitor& visitor);
void Think(float, CStateManager&);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
rstl::optional_object< CAABox > GetTouchBounds() const;
void Touch(CActor&, CStateManager&);
void CleanUp() {}
CPlane GetPlane(const CStateManager&) const;
TAreaId GetAreaId() const { return x260_area; }

4
include/MetroidPrime/ScriptObjects/CScriptDockAreaChange.hpp
View File

@@ -9,8 +9,8 @@ class CScriptDockAreaChange : public CEntity {
public:
CScriptDockAreaChange(TUniqueId, const rstl::string&, const CEntityInfo&, int, bool);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);
void Accept(IVisitor& visitor);
~CScriptDockAreaChange();
};

14
include/MetroidPrime/ScriptObjects/CScriptEMPulse.hpp
View File

@@ -11,13 +11,13 @@ public:
CScriptEMPulse(TUniqueId, const rstl::string&, const CEntityInfo&, const CTransform4f&, bool,
float, float, float, float, float, float, float, CAssetId);
void Accept(IVisitor&) override;
void Think(float, CStateManager&) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override;
void CalculateRenderBounds() override;
rstl::optional_object< CAABox > GetTouchBounds() const override;
void Touch(CActor&, CStateManager&) override;
void Accept(IVisitor&);
void Think(float, CStateManager&);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const;
void CalculateRenderBounds();
rstl::optional_object< CAABox > GetTouchBounds() const;
void Touch(CActor&, CStateManager&);
private:
float xe8_duration;

4
include/MetroidPrime/ScriptObjects/CScriptGenerator.hpp
View File

@@ -10,8 +10,8 @@ public:
bool active, float minScale, float maxScale);
~CScriptGenerator();
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);
private:
int x34_spawnCount;

4
include/MetroidPrime/ScriptObjects/CScriptHUDMemo.hpp
View File

@@ -26,8 +26,8 @@ public:
CScriptHUDMemo::EDisplayType, CAssetId, bool);
~CScriptHUDMemo();
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void Accept(IVisitor& visitor);
};
CHECK_SIZEOF(CScriptHUDMemo, 0x54)

8
include/MetroidPrime/ScriptObjects/CScriptMazeNode.hpp
View File

@@ -78,11 +78,11 @@ public:
const CTransform4f& xf, bool active, int col, int row, int side,
const CVector3f& actorPos, const CVector3f& triggerPos,
const CVector3f& effectPos);
~CScriptMazeNode() override;
~CScriptMazeNode();
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
void Think(float dt, CStateManager& mgr) override;
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr);
void Think(float dt, CStateManager& mgr);
static void LoadMazeSeeds();

6
include/MetroidPrime/ScriptObjects/CScriptMidi.hpp
View File

@@ -9,12 +9,12 @@ class CScriptMidi : public CEntity {
public:
CScriptMidi(TUniqueId id, const CEntityInfo& info, const rstl::string& name, bool active,
CAssetId csng, float, float, int);
~CScriptMidi() override;
~CScriptMidi();
void Stop(CStateManager& mgr, float fadeTime);
void Play(CStateManager& mgr, float fadeTime);
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);
private:
TToken< CMidiManager::CMidiData > x34_song;

12
include/MetroidPrime/ScriptObjects/CScriptPickup.hpp
View File

@@ -31,12 +31,12 @@ public:
float startDelay, bool active);
~CScriptPickup();
void Think(float, CStateManager&) override;
void Touch(CActor&, CStateManager&) override;
rstl::optional_object< CAABox > GetTouchBounds() const override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
void Render(const CStateManager&) const override;
void Accept(IVisitor& visitor) override;
void Think(float, CStateManager&);
void Touch(CActor&, CStateManager&);
rstl::optional_object< CAABox > GetTouchBounds() const;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr);
void Render(const CStateManager&) const;
void Accept(IVisitor& visitor);
float GetPossibility() const;
CPlayerState::EItemType GetItem() const;

4
include/MetroidPrime/ScriptObjects/CScriptPickupGenerator.hpp
View File

@@ -9,9 +9,9 @@ public:
float, bool);
~CScriptPickupGenerator();
void Accept(IVisitor& visitor) override;
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender,
CStateManager& stateMgr) override;
CStateManager& stateMgr);
private:
CVector3f x34_position;

30
include/MetroidPrime/ScriptObjects/CScriptPlatform.hpp
View File

@@ -44,25 +44,25 @@ public:
bool rainSplashes, uint maxRainSplashes, uint rainGenRate);
// CEntity
~CScriptPlatform() override;
void Accept(IVisitor& visitor) override;
void PreThink(float dt, CStateManager& mgr) override;
void Think(float dt, CStateManager& mgr) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
~CScriptPlatform();
void Accept(IVisitor& visitor);
void PreThink(float dt, CStateManager& mgr);
void Think(float dt, CStateManager& mgr);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr);
// CActor
void PreRender(CStateManager&, const CFrustumPlanes&) override;
void Render(const CStateManager&) const override;
CHealthInfo* HealthInfo(CStateManager&) override;
const CDamageVulnerability* GetDamageVulnerability() const override;
rstl::optional_object< CAABox > GetTouchBounds() const override;
CVector3f GetOrbitPosition(const CStateManager&) const override;
CVector3f GetAimPosition(const CStateManager&, float) const override;
CAABox GetSortingBounds(const CStateManager&) const override;
void PreRender(CStateManager&, const CFrustumPlanes&);
void Render(const CStateManager&) const;
CHealthInfo* HealthInfo(CStateManager&);
const CDamageVulnerability* GetDamageVulnerability() const;
rstl::optional_object< CAABox > GetTouchBounds() const;
CVector3f GetOrbitPosition(const CStateManager&) const;
CVector3f GetAimPosition(const CStateManager&, float) const;
CAABox GetSortingBounds(const CStateManager&) const;
// CPhysicsActor
const CCollisionPrimitive* GetCollisionPrimitive() const override;
CTransform4f GetPrimitiveTransform() const override;
const CCollisionPrimitive* GetCollisionPrimitive() const;
CTransform4f GetPrimitiveTransform() const;
// CScriptPlatform
virtual void SplashThink(const CAABox&, const CFluidPlane&, float, CStateManager&) const;

4
include/MetroidPrime/ScriptObjects/CScriptPlayerHint.hpp
View File

@@ -9,8 +9,8 @@ public:
const CTransform4f& xf, bool active, int priority, int overrideFlags);
~CScriptPlayerHint();
void Accept(IVisitor& visit) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void Accept(IVisitor& visit);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
int GetPriority() const { return x100_priority; }
int GetOverrideFlags() const { return x104_overrideFlags; }
TUniqueId GetActorId() const { return x108_mpId; }

4
include/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.hpp
View File

@@ -18,8 +18,8 @@ private:
public:
CScriptPlayerStateChange(TUniqueId, const rstl::string&, const CEntityInfo&, bool, int, int, int, EControl,
EControlCommandOption);
void Accept(IVisitor& visit) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void Accept(IVisitor& visit);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
~CScriptPlayerStateChange();
bool Filtered() { return x44_ctrlCmdOpt == kCCO_Filtered; }

14
include/MetroidPrime/ScriptObjects/CScriptPointOfInterest.hpp
View File

@@ -14,13 +14,13 @@ public:
const CScannableParameters&, float);
~CScriptPointOfInterest();
void Accept(IVisitor& visitor) override;
void Think(float, CStateManager&) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override;
void Render(const CStateManager&) const override;
void CalculateRenderBounds() override;
rstl::optional_object<CAABox> GetTouchBounds() const override;
void Accept(IVisitor& visitor);
void Think(float, CStateManager&);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const;
void Render(const CStateManager&) const;
void CalculateRenderBounds();
rstl::optional_object<CAABox> GetTouchBounds() const;
};
#endif // _CSCRIPTPOINTOFINTEREST

10
include/MetroidPrime/ScriptObjects/CScriptProjectedShadow.hpp
View File

@@ -12,11 +12,11 @@ public:
CScriptShadowProjector(TUniqueId, const rstl::string&, const CEntityInfo&, const CTransform4f&,
bool, const CVector3f&, bool, float, float, float, float, int);
void Accept(IVisitor& visitor) override;
void Think(float, CStateManager&) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void PreRender(CStateManager&, const CFrustumPlanes&) override;
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override;
void Accept(IVisitor& visitor);
void Think(float, CStateManager&);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void PreRender(CStateManager&, const CFrustumPlanes&);
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const;
void CreateProjectedShadow();
uchar GetPersistent() const { return x110_24_persistent; }

4
include/MetroidPrime/ScriptObjects/CScriptRandomRelay.hpp
View File

@@ -9,8 +9,8 @@ public:
int sendSetSize, int sendSetVariance, bool percentSize, bool active);
~CScriptRandomRelay();
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);
void SendLocalScriptMsgs(EScriptObjectState state, CStateManager& stateMgr);
private:

6
include/MetroidPrime/ScriptObjects/CScriptRelay.hpp
View File

@@ -11,9 +11,9 @@ public:
CScriptRelay(TUniqueId, const rstl::string&, const CEntityInfo&, bool);
void UpdateObjectRef(CStateManager& stateMgr);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
void Think(float, CStateManager& stateMgr) override;
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);
void Think(float, CStateManager& stateMgr);
void Accept(IVisitor& visitor);
~CScriptRelay();
};

6
include/MetroidPrime/ScriptObjects/CScriptRipple.hpp
View File

@@ -13,9 +13,9 @@ public:
CScriptRipple(TUniqueId, const rstl::string&, const CEntityInfo&, const CVector3f&, bool, float);
~CScriptRipple();
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void Think(float, CStateManager&) override;
void Accept(IVisitor&) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void Think(float, CStateManager&);
void Accept(IVisitor&);
};
#endif // _CSCRIPTRIPPLE

6
include/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.hpp
View File

@@ -79,9 +79,9 @@ public:
int feedbackS, int outputL, int outputR, int outputS);
virtual ~CScriptRoomAcoustics();
void Think(float dt, CStateManager& stateMgr) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
void Accept(IVisitor& visitor) override;
void Think(float dt, CStateManager& stateMgr);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);
void Accept(IVisitor& visitor);
void EnableAuxCallbacks();
static void DisableAuxCallbacks();

6
include/MetroidPrime/ScriptObjects/CScriptSpawnPoint.hpp
View File

@@ -19,9 +19,9 @@ public:
const rstl::reserved_vector< int, int(CPlayerState::kIT_Max) >& itemCounts,
bool, bool, bool);
~CScriptSpawnPoint() override;
void Accept(IVisitor&) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
~CScriptSpawnPoint();
void Accept(IVisitor&);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
const CTransform4f& GetTransform() const;
int GetPowerup(const CPlayerState::EItemType&) const;

14
include/MetroidPrime/ScriptObjects/CScriptSpecialFunction.hpp
View File

@@ -123,13 +123,13 @@ public:
const CVector3f&, const CColor&, bool, const CDamageInfo&, int, int,
CPlayerState::EItemType, ushort, ushort, ushort);
void Accept(IVisitor& visitor) override;
void Think(float, CStateManager&) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void PreRender(CStateManager&, const CFrustumPlanes&) override;
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override;
void Render(const CStateManager&) const override;
rstl::optional_object< CAABox > GetTouchBounds() const override { return x1c8_touchBounds; }
void Accept(IVisitor& visitor);
void Think(float, CStateManager&);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void PreRender(CStateManager&, const CFrustumPlanes&);
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const;
void Render(const CStateManager&) const;
rstl::optional_object< CAABox > GetTouchBounds() const { return x1c8_touchBounds; }
void SkipCinematic(CStateManager&);
void RingScramble(CStateManager&);

10
include/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.hpp
View File

@@ -13,11 +13,11 @@ public:
const CVector3f& scale, bool active);
~CScriptSpiderBallAttractionSurface();
void Accept(IVisitor& visitor) override;
void Think(float dt, CStateManager& mgr) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CStateManager& mgr) override;
rstl::optional_object< CAABox > GetTouchBounds() const override;
void Touch(CActor& actor, CStateManager& mgr) override;
void Accept(IVisitor& visitor);
void Think(float dt, CStateManager& mgr);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CStateManager& mgr);
rstl::optional_object< CAABox > GetTouchBounds() const;
void Touch(CActor& actor, CStateManager& mgr);
const CVector3f& GetScale() const { return xe8_scale; }
};

4
include/MetroidPrime/ScriptObjects/CScriptStreamedAudio.hpp
View File

@@ -12,8 +12,8 @@ public:
void Stop(CStateManager& mgr);
void Play(CStateManager& mgr);
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);
private:
rstl::string x34_fileName;

10
include/MetroidPrime/ScriptObjects/CScriptTargetingPoint.hpp
View File

@@ -15,14 +15,14 @@ public:
bool);
~CScriptTargetingPoint();
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
bool GetLocked() const;
void Think(float, CStateManager&) override;
void Think(float, CStateManager&);
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override;
void Render(const CStateManager&) const override;
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const;
void Render(const CStateManager&) const;
};

Some files were not shown because too many files have changed in this diff Show More