primeret/prime
0
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2026-07-12 18:18:56 -07: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
include/MetroidPrime/ScriptObjects/CFire.hpp
+7 -7
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_;
include/MetroidPrime/ScriptObjects/CHUDBillboardEffect.hpp
+6 -6
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(); }
include/MetroidPrime/ScriptObjects/CRepulsor.hpp
+2 -2
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; }
};
include/MetroidPrime/ScriptObjects/CScriptActor.hpp
+11 -11
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; }
include/MetroidPrime/ScriptObjects/CScriptActorKeyframe.hpp
+3 -3
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; }
include/MetroidPrime/ScriptObjects/CScriptActorRotate.hpp
+3 -3
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;
include/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.hpp
+6 -6
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; }
include/MetroidPrime/ScriptObjects/CScriptAreaAttributes.hpp
+2 -2
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; }
include/MetroidPrime/ScriptObjects/CScriptBallTrigger.hpp
+5 -5
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;
include/MetroidPrime/ScriptObjects/CScriptBeam.hpp
+3 -3
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
include/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.hpp
+2 -2
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
include/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.hpp
+2 -2
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
include/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.hpp
+4 -4
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
include/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.hpp
+4 -4
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; }
include/MetroidPrime/ScriptObjects/CScriptCameraShaker.hpp
+2 -2
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
include/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.hpp
+4 -4
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; }
include/MetroidPrime/ScriptObjects/CScriptControllerAction.hpp
+2 -2
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);
};
include/MetroidPrime/ScriptObjects/CScriptCounter.hpp
+2 -2
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
include/MetroidPrime/ScriptObjects/CScriptCoverPoint.hpp
+6 -6
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;
include/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.hpp
+10 -10
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;

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