PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-09 22:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert override removal

Browse Source 
Former-commit-id: b6ddfcfc35
This commit is contained in:
Luke Street
2023-02-06 12:01:01 -05:00
parent 03f6f75516
commit 9b99045882
148 changed files with 1030 additions and 1023 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,15 +18,15 @@ public:
float f2, float f3, float f4);
// CEntity
~CFire();
void Accept(IVisitor& visitor);
void Think(float dt, CStateManager& mgr);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr);
~CFire() override;
void Accept(IVisitor& visitor) override;
void Think(float dt, CStateManager& mgr) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
// CActor
void Render(const CStateManager&) const;
rstl::optional_object< CAABox > GetTouchBounds() const;
void Touch(CActor&, CStateManager&);
void Render(const CStateManager&) const override;
rstl::optional_object< CAABox > GetTouchBounds() const override;
void Touch(CActor&, CStateManager&) override;
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();
~CHUDBillboardEffect() 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;
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;
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);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
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();
void Accept(IVisitor& visitor);
void Think(float dt, CStateManager& mgr);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr);
~CScriptActor() override;
void Accept(IVisitor& visitor) override;
void Think(float dt, CStateManager& mgr) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
// CActor
void PreRender(CStateManager&, const CFrustumPlanes&);
CHealthInfo* HealthInfo(CStateManager&);
const CDamageVulnerability* GetDamageVulnerability() const;
rstl::optional_object< CAABox > GetTouchBounds() const;
void Touch(CActor&, CStateManager&);
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;
// CPhysicsActor
EWeaponCollisionResponseTypes GetCollisionResponseType(const CVector3f&, const CVector3f&,
const CWeaponMode&,
int) const;
CAABox GetSortingBounds(const CStateManager&) const;
int) const override;
CAABox GetSortingBounds(const CStateManager&) const override;
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);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);
void Think(float, CStateManager&);
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
void Think(float, CStateManager&) override;
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);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void Think(float, CStateManager&);
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void Think(float, CStateManager&) override;
private:
CVector3f x34_rotation;

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

@@ -18,12 +18,12 @@ public:
float);
~CScriptAiJumpPoint();
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;
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;
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);
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
void Accept(IVisitor& visitor) override;
~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&);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void Think(float, CStateManager& mgr);
void InhabitantAdded(CActor&, CStateManager&);
void InhabitantExited(CActor&, CStateManager&);
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;
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);
void Think(float, CStateManager&);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void Accept(IVisitor& visitor) override;
void Think(float, CStateManager&) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
};
#endif // _CSCRIPTBEAM

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

@@ -18,8 +18,8 @@ public:
float timeOut, bool active);
~CScriptCameraBlurKeyframe();
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
};
#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);
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
void Accept(IVisitor& visitor) override;
};
#endif // _CSCRIPTCAMERAFILTERKEYFRAME

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

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

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

@@ -13,10 +13,10 @@ public:
const CRelAngle&, float);
~CScriptCameraPitchVolume();
void Accept(IVisitor& visitor);
void Think(float, CStateManager&);
rstl::optional_object< CAABox > GetTouchBounds() const;
void Touch(CActor&, CStateManager&);
void Accept(IVisitor& visitor) override;
void Think(float, CStateManager&) override;
rstl::optional_object< CAABox > GetTouchBounds() const override;
void Touch(CActor&, CStateManager&) override;
// 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);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
};
#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);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const;
void Render(const CStateManager&) const;
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;
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);
void Think(float, CStateManager&);
void Accept(IVisitor& visitor) override;
void Think(float, CStateManager&) override;
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);
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
void Accept(IVisitor& visitor) override;
};
#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);
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;
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;
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);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
EWeaponCollisionResponseTypes GetCollisionResponseType(const CVector3f&, const CVector3f&,
const CWeaponMode&,
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;
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;
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();
~CScriptDebugCameraWaypoint() override;
void Accept(IVisitor& visitor);
void Accept(IVisitor& visitor) override;
private:
uint xe8_value;

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

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

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

@@ -11,11 +11,11 @@ public:
void SetDockReference(CStateManager& mgr, int);
void Accept(IVisitor& visitor);
void Think(float, CStateManager&);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
rstl::optional_object< CAABox > GetTouchBounds() const;
void Touch(CActor&, CStateManager&);
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 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);
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
void Accept(IVisitor& visitor) override;
~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&);
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&);
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;
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);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
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&);
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void Accept(IVisitor& visitor) override;
};
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();
~CScriptMazeNode() override;
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr);
void Think(float dt, CStateManager& mgr);
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
void Think(float dt, CStateManager& mgr) override;
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();
~CScriptMidi() override;
void Stop(CStateManager& mgr, float fadeTime);
void Play(CStateManager& mgr, float fadeTime);
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
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&);
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);
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;
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);
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender,
CStateManager& stateMgr);
CStateManager& stateMgr) override;
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();
void Accept(IVisitor& visitor);
void PreThink(float dt, CStateManager& mgr);
void Think(float dt, CStateManager& mgr);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr);
~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;
// CActor
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;
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;
// CPhysicsActor
const CCollisionPrimitive* GetCollisionPrimitive() const;
CTransform4f GetPrimitiveTransform() const;
const CCollisionPrimitive* GetCollisionPrimitive() const override;
CTransform4f GetPrimitiveTransform() const override;
// 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);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void Accept(IVisitor& visit) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
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);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void Accept(IVisitor& visit) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
~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);
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;
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;
};
#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);
void Think(float, CStateManager&);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void PreRender(CStateManager&, const CFrustumPlanes&);
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const;
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 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);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
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);
void Think(float, CStateManager& stateMgr);
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
void Think(float, CStateManager& stateMgr) override;
void Accept(IVisitor& visitor) override;
~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&);
void Think(float, CStateManager&);
void Accept(IVisitor&);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void Think(float, CStateManager&) override;
void Accept(IVisitor&) override;
};
#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);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);
void Accept(IVisitor& visitor);
void Think(float dt, CStateManager& stateMgr) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
void Accept(IVisitor& visitor) override;
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();
void Accept(IVisitor&);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
~CScriptSpawnPoint() override;
void Accept(IVisitor&) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
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);
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 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 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);
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);
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;
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);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
private:
rstl::string x34_fileName;

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

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

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

@@ -60,15 +60,15 @@ public:
uint triggerFlags, bool active, bool deactivateOnEntered, bool deactivateOnExited);
~CScriptTrigger();
void Touch(CActor&, CStateManager&);
void Touch(CActor&, CStateManager&) override;
CAABox GetTriggerBoundsWR() const;
rstl::optional_object<CAABox> GetTouchBounds() const;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void Think(float, CStateManager&);
rstl::optional_object<CAABox> GetTouchBounds() const override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void Think(float, CStateManager&) override;
void UpdateInhabitants(float, CStateManager&);
const rstl::list<CObjectTracker>& GetInhabitants() const;
const CScriptTrigger::CObjectTracker* FindObject(TUniqueId);
void Accept(IVisitor& visitor);
void Accept(IVisitor& visitor) override;
virtual void InhabitantAdded(CActor&, CStateManager&);
virtual void InhabitantIdle(CActor&, CStateManager&);
virtual void InhabitantExited(CActor&, CStateManager&);

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

@@ -15,12 +15,12 @@ public:
const rstl::vector<CVisorFlare::CFlareDef>& flares);
~CScriptVisorFlare();
void Accept(IVisitor& visitor);
void Think(float, CStateManager& stateMgr);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);
void PreRender(CStateManager&, const CFrustumPlanes&);
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const;
void Render(const CStateManager&) const;
void Accept(IVisitor& visitor) override;
void Think(float, CStateManager& stateMgr) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
void PreRender(CStateManager&, const CFrustumPlanes&) override;
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override;
void Render(const CStateManager&) const override;
};
#endif // _CSCRIPTVISORFLARE

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

@@ -14,13 +14,13 @@ public:
bool forceShow, bool active);
~CScriptVisorGoo();
void Accept(IVisitor& visitor);
void Think(float, CStateManager& stateMgr);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr);
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const;
void Render(const CStateManager&) const;
rstl::optional_object< CAABox > GetTouchBounds() const;
void Touch(CActor&, CStateManager&);
void Accept(IVisitor& visitor) override;
void Think(float, CStateManager& stateMgr) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override;
void Render(const CStateManager&) const override;
rstl::optional_object< CAABox > GetTouchBounds() const override;
void Touch(CActor&, CStateManager&) override;
private:
TToken< CGenDescription > xe8_particleDesc;

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

@@ -13,13 +13,13 @@ public:
int behaviourOrient, int behaviourModifiers, uint animation);
// CEntity
~CScriptWaypoint();
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr);
~CScriptWaypoint() override;
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
// CActor
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const;
void Render(const CStateManager&) const;
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override;
void Render(const CStateManager&) const override;
// CScriptWaypoint
TUniqueId NextWaypoint(const CStateManager& mgr) const;

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

@@ -23,8 +23,8 @@ public:
bool fadeWhite, float charFadeIn, float charsPerSecond, float showDelay);
~CScriptWorldTeleporter();
void Accept(IVisitor&);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr);
void Accept(IVisitor&) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
void StartTransition(CStateManager&);
bool GetFadeWhite() const { return x40_27_fadeWhite; }