From 9b990458821d4e49171ffecb8628d5bcfaccccce Mon Sep 17 00:00:00 2001 From: Luke Street Date: Mon, 6 Feb 2023 12:01:01 -0500 Subject: [PATCH] Revert override removal Former-commit-id: b6ddfcfc35003362c7941be708c17a560f822f1c --- include/Collision/CCollidableSphere.hpp | 10 +- include/GuiSys/CGuiCompoundWidget.hpp | 6 +- include/GuiSys/CGuiGroup.hpp | 6 +- include/GuiSys/CGuiModel.hpp | 8 +- include/GuiSys/CGuiPane.hpp | 2 +- include/GuiSys/CGuiTextPane.hpp | 12 +- include/Kyoto/Alloc/CGameAllocator.hpp | 22 +-- include/Kyoto/Input/CDolphinController.hpp | 12 +- include/Kyoto/Particles/CColorElement.hpp | 32 ++-- include/Kyoto/Particles/CElementGen.hpp | 54 +++--- include/Kyoto/Particles/CIntElement.hpp | 78 ++++----- include/Kyoto/Particles/CModVectorElement.hpp | 52 +++--- include/Kyoto/Particles/CParticleElectric.hpp | 52 +++--- include/Kyoto/Particles/CRealElement.hpp | 160 +++++++++--------- include/Kyoto/Particles/CUVElement.hpp | 20 +-- include/Kyoto/Particles/CVectorElement.hpp | 40 ++--- include/Kyoto/Particles/IElement.hpp | 2 +- include/Kyoto/Streams/CMemoryInStream.hpp | 4 +- include/Kyoto/Streams/CZipInputStream.hpp | 4 +- include/MetaRender/CCubeRenderer.hpp | 130 +++++++------- include/MetroidPrime/BodyState/CABSAim.hpp | 6 +- include/MetroidPrime/BodyState/CABSFlinch.hpp | 6 +- include/MetroidPrime/BodyState/CABSIdle.hpp | 6 +- .../MetroidPrime/BodyState/CABSReaction.hpp | 6 +- include/MetroidPrime/BodyState/CBSAttack.hpp | 8 +- include/MetroidPrime/BodyState/CBSCover.hpp | 12 +- include/MetroidPrime/BodyState/CBSDie.hpp | 10 +- include/MetroidPrime/BodyState/CBSFall.hpp | 6 +- .../MetroidPrime/BodyState/CBSGenerate.hpp | 6 +- include/MetroidPrime/BodyState/CBSGetup.hpp | 6 +- .../MetroidPrime/BodyState/CBSGroundHit.hpp | 6 +- .../MetroidPrime/BodyState/CBSKnockBack.hpp | 8 +- .../MetroidPrime/BodyState/CBSLieOnGround.hpp | 6 +- .../MetroidPrime/BodyState/CBSLocomotion.hpp | 8 +- .../MetroidPrime/BodyState/CBSLoopAttack.hpp | 8 +- .../BodyState/CBSLoopReaction.hpp | 6 +- .../BodyState/CBSProjectileAttack.hpp | 8 +- .../MetroidPrime/BodyState/CBSScripted.hpp | 8 +- include/MetroidPrime/BodyState/CBSSlide.hpp | 10 +- include/MetroidPrime/BodyState/CBSStep.hpp | 10 +- include/MetroidPrime/BodyState/CBSTaunt.hpp | 6 +- include/MetroidPrime/BodyState/CBSTurn.hpp | 14 +- .../BodyState/CBodyStateCmdMgr.hpp | 2 +- include/MetroidPrime/CActor.hpp | 2 +- .../MetroidPrime/CAnimationDatabaseGame.hpp | 10 +- include/MetroidPrime/CAudioStateWin.hpp | 4 +- include/MetroidPrime/CCollisionActor.hpp | 26 +-- include/MetroidPrime/CConsoleOutputWindow.hpp | 4 +- include/MetroidPrime/CCredits.hpp | 8 +- include/MetroidPrime/CEffect.hpp | 6 +- include/MetroidPrime/CErrorOutputWindow.hpp | 8 +- include/MetroidPrime/CExplosion.hpp | 16 +- include/MetroidPrime/CFlameWarp.hpp | 12 +- include/MetroidPrime/CGameArea.hpp | 16 +- include/MetroidPrime/CGameLight.hpp | 4 +- include/MetroidPrime/CMainFlow.hpp | 8 +- .../MetroidPrime/CParticleGenInfoGeneric.hpp | 34 ++-- include/MetroidPrime/CPhysicsActor.hpp | 8 +- include/MetroidPrime/CSplashScreen.hpp | 6 +- include/MetroidPrime/CWorld.hpp | 22 +-- include/MetroidPrime/Cameras/CBallCamera.hpp | 14 +- .../MetroidPrime/Cameras/CCinematicCamera.hpp | 10 +- include/MetroidPrime/Cameras/CGameCamera.hpp | 8 +- .../Cameras/CInterpolationCamera.hpp | 4 +- include/MetroidPrime/Enemies/CAi.hpp | 10 +- .../MetroidPrime/Enemies/CFlaahgraPlants.hpp | 14 +- include/MetroidPrime/Enemies/CMetaree.hpp | 32 ++-- .../Enemies/CMetroidPrimeProjectile.hpp | 6 +- .../MetroidPrime/Enemies/CNewIntroBoss.hpp | 34 ++-- include/MetroidPrime/Enemies/CPatterned.hpp | 112 ++++++------ include/MetroidPrime/Enemies/CPuffer.hpp | 14 +- .../Enemies/CRipperControlledPlatform.hpp | 2 +- include/MetroidPrime/GameObjectLists.hpp | 14 +- include/MetroidPrime/Player/CPlayer.hpp | 48 +++--- include/MetroidPrime/ScriptObjects/CFire.hpp | 14 +- .../ScriptObjects/CHUDBillboardEffect.hpp | 12 +- .../MetroidPrime/ScriptObjects/CRepulsor.hpp | 4 +- .../ScriptObjects/CScriptActor.hpp | 22 +-- .../ScriptObjects/CScriptActorKeyframe.hpp | 6 +- .../ScriptObjects/CScriptActorRotate.hpp | 6 +- .../ScriptObjects/CScriptAiJumpPoint.hpp | 12 +- .../ScriptObjects/CScriptAreaAttributes.hpp | 4 +- .../ScriptObjects/CScriptBallTrigger.hpp | 10 +- .../ScriptObjects/CScriptBeam.hpp | 6 +- .../CScriptCameraBlurKeyframe.hpp | 4 +- .../CScriptCameraFilterKeyframe.hpp | 4 +- .../CScriptCameraHintTrigger.hpp | 8 +- .../CScriptCameraPitchVolume.hpp | 8 +- .../ScriptObjects/CScriptCameraShaker.hpp | 4 +- .../ScriptObjects/CScriptCameraWaypoint.hpp | 8 +- .../ScriptObjects/CScriptControllerAction.hpp | 4 +- .../ScriptObjects/CScriptCounter.hpp | 4 +- .../ScriptObjects/CScriptCoverPoint.hpp | 12 +- .../CScriptDamageableTrigger.hpp | 20 +-- .../CScriptDebugCameraWaypoint.hpp | 4 +- .../ScriptObjects/CScriptDistanceFog.hpp | 4 +- .../ScriptObjects/CScriptDock.hpp | 10 +- .../ScriptObjects/CScriptDockAreaChange.hpp | 4 +- .../ScriptObjects/CScriptEMPulse.hpp | 14 +- .../ScriptObjects/CScriptGenerator.hpp | 4 +- .../ScriptObjects/CScriptHUDMemo.hpp | 4 +- .../ScriptObjects/CScriptMazeNode.hpp | 8 +- .../ScriptObjects/CScriptMidi.hpp | 6 +- .../ScriptObjects/CScriptPickup.hpp | 12 +- .../ScriptObjects/CScriptPickupGenerator.hpp | 4 +- .../ScriptObjects/CScriptPlatform.hpp | 30 ++-- .../ScriptObjects/CScriptPlayerHint.hpp | 4 +- .../CScriptPlayerStateChange.hpp | 4 +- .../ScriptObjects/CScriptPointOfInterest.hpp | 14 +- .../ScriptObjects/CScriptProjectedShadow.hpp | 10 +- .../ScriptObjects/CScriptRandomRelay.hpp | 4 +- .../ScriptObjects/CScriptRelay.hpp | 6 +- .../ScriptObjects/CScriptRipple.hpp | 6 +- .../ScriptObjects/CScriptRoomAcoustics.hpp | 6 +- .../ScriptObjects/CScriptSpawnPoint.hpp | 6 +- .../ScriptObjects/CScriptSpecialFunction.hpp | 14 +- .../CScriptSpiderBallAttractionSurface.hpp | 10 +- .../ScriptObjects/CScriptStreamedAudio.hpp | 4 +- .../ScriptObjects/CScriptTargetingPoint.hpp | 10 +- .../ScriptObjects/CScriptTrigger.hpp | 10 +- .../ScriptObjects/CScriptVisorFlare.hpp | 12 +- .../ScriptObjects/CScriptVisorGoo.hpp | 14 +- .../ScriptObjects/CScriptWaypoint.hpp | 10 +- .../ScriptObjects/CScriptWorldTeleporter.hpp | 4 +- include/MetroidPrime/TCastTo.hpp | 2 +- include/MetroidPrime/Tweaks/CTweakBall.hpp | 2 +- include/MetroidPrime/Tweaks/CTweakGame.hpp | 2 +- .../MetroidPrime/Tweaks/CTweakGuiColors.hpp | 2 +- include/MetroidPrime/Tweaks/CTweakGunRes.hpp | 2 +- include/MetroidPrime/Tweaks/CTweakPlayer.hpp | 2 +- .../Tweaks/CTweakPlayerControl.hpp | 2 +- .../MetroidPrime/Tweaks/CTweakPlayerGun.hpp | 2 +- .../MetroidPrime/Weapons/CBeamProjectile.hpp | 10 +- .../Weapons/CElectricBeamProjectile.hpp | 14 +- .../Weapons/CEnergyProjectile.hpp | 16 +- .../MetroidPrime/Weapons/CGameProjectile.hpp | 12 +- include/MetroidPrime/Weapons/CIceBeam.hpp | 22 +-- include/MetroidPrime/Weapons/CPlasmaBeam.hpp | 18 +- .../Weapons/CPlasmaProjectile.hpp | 18 +- include/MetroidPrime/Weapons/CPowerBeam.hpp | 18 +- include/MetroidPrime/Weapons/CPowerBomb.hpp | 14 +- .../Weapons/CTargetableProjectile.hpp | 10 +- include/MetroidPrime/Weapons/CWaveBeam.hpp | 18 +- include/MetroidPrime/Weapons/CWeapon.hpp | 10 +- .../WorldFormat/CCollidableOBBTreeGroup.hpp | 12 +- include/dolphin/types.h | 7 + src/Kyoto/zlib/contrib/delphi2/zlib.pas | 16 +- src/MetroidPrime/TCastTo.cpp | 4 +- 148 files changed, 1030 insertions(+), 1023 deletions(-) diff --git a/include/Collision/CCollidableSphere.hpp b/include/Collision/CCollidableSphere.hpp index 68470a74..d503fba9 100644 --- a/include/Collision/CCollidableSphere.hpp +++ b/include/Collision/CCollidableSphere.hpp @@ -12,11 +12,11 @@ public: CCollidableSphere(const CSphere& sphere, const CMaterialList& material) : CCollisionPrimitive(material), x10_sphere(sphere) {} - uint GetTableIndex() const; - CAABox CalculateAABox(const CTransform4f&) const; - CAABox CalculateLocalAABox() const; - FourCC GetPrimType() const; - ~CCollidableSphere() {} + uint GetTableIndex() const override; + CAABox CalculateAABox(const CTransform4f&) const override; + CAABox CalculateLocalAABox() const override; + FourCC GetPrimType() const override; + ~CCollidableSphere() override {} CRayCastResult CastRayInternal(const CInternalRayCastStructure&) const; private: diff --git a/include/GuiSys/CGuiCompoundWidget.hpp b/include/GuiSys/CGuiCompoundWidget.hpp index e85012be..337baf74 100644 --- a/include/GuiSys/CGuiCompoundWidget.hpp +++ b/include/GuiSys/CGuiCompoundWidget.hpp @@ -5,10 +5,10 @@ class CGuiCompoundWidget : public CGuiWidget { public: - FourCC GetWidgetTypeID() const { return -1; } + FourCC GetWidgetTypeID() const override { return -1; } - void OnVisible(); - void OnActivate(); + void OnVisible() override; + void OnActivate() override; virtual CGuiWidget* GetWorkerWidget(int id) const; private: }; diff --git a/include/GuiSys/CGuiGroup.hpp b/include/GuiSys/CGuiGroup.hpp index 0b08d165..f139874b 100644 --- a/include/GuiSys/CGuiGroup.hpp +++ b/include/GuiSys/CGuiGroup.hpp @@ -5,13 +5,13 @@ class CGuiGroup : public CGuiCompoundWidget { public: - FourCC GetWidgetTypeID() const { return 'GRUP'; } + FourCC GetWidgetTypeID() const override { return 'GRUP'; } void SelectWorkerWidget(int workerId, bool setActive, bool setVisible); CGuiWidget* GetSelectedWidget(); const CGuiWidget* GetSelectedWidget() const; - bool AddWorkerWidget(CGuiWidget* worker); - void OnActivate(); + bool AddWorkerWidget(CGuiWidget* worker) override; + void OnActivate() override; private: uint xb8_workerCount; diff --git a/include/GuiSys/CGuiModel.hpp b/include/GuiSys/CGuiModel.hpp index 0073b275..710bebc0 100644 --- a/include/GuiSys/CGuiModel.hpp +++ b/include/GuiSys/CGuiModel.hpp @@ -14,10 +14,10 @@ public: bool flag); const TLockedToken< CModel >& GetModel() const { return xb8_model; } - bool GetIsFinishedLoadingWidgetSpecific() const; - void Touch() const; - void Draw(const CGuiWidgetDrawParms& parms) const; - // bool TestCursorHit(const CMatrix4f& vp, const CVector2f& point) const; + bool GetIsFinishedLoadingWidgetSpecific() const override; + void Touch() const override; + void Draw(const CGuiWidgetDrawParms& parms) const override; + // bool TestCursorHit(const CMatrix4f& vp, const CVector2f& point) const override; private: TLockedToken< CModel > xb8_model; diff --git a/include/GuiSys/CGuiPane.hpp b/include/GuiSys/CGuiPane.hpp index 8465ad08..529b849a 100644 --- a/include/GuiSys/CGuiPane.hpp +++ b/include/GuiSys/CGuiPane.hpp @@ -7,7 +7,7 @@ class CGuiPane : public CGuiWidget { public: CGuiPane(const CGuiWidgetParms& parms, const CVector2f& dim, const CVector3f& scaleCenter); - void Draw(const CGuiWidgetDrawParms& parms) const; + void Draw(const CGuiWidgetDrawParms& parms) const override; virtual void ScaleDimensions(const CVector3f& scale); virtual void SetDimensions(const CVector2f& dim, bool initVBO); virtual CVector2f GetDimensions() const; diff --git a/include/GuiSys/CGuiTextPane.hpp b/include/GuiSys/CGuiTextPane.hpp index e230986b..f16a1b02 100644 --- a/include/GuiSys/CGuiTextPane.hpp +++ b/include/GuiSys/CGuiTextPane.hpp @@ -19,12 +19,12 @@ public: CGuiTextSupport& TextSupport() { return xd4_textSupport; } const CGuiTextSupport& GetTextSupport() const { return xd4_textSupport; } - void Update(float dt); - bool GetIsFinishedLoadingWidgetSpecific() const; - void SetDimensions(const CVector2f& dim, bool initVBO); - void ScaleDimensions(const CVector3f& scale); - void Draw(const CGuiWidgetDrawParms& parms) const; - // bool TestCursorHit(const CMatrix4f& vp, const CVector2f& point) const; + void Update(float dt) override; + bool GetIsFinishedLoadingWidgetSpecific() const override; + void SetDimensions(const CVector2f& dim, bool initVBO) override; + void ScaleDimensions(const CVector3f& scale) override; + void Draw(const CGuiWidgetDrawParms& parms) const override; + // bool TestCursorHit(const CMatrix4f& vp, const CVector2f& point) const override; private: CGuiTextSupport xd4_textSupport; diff --git a/include/Kyoto/Alloc/CGameAllocator.hpp b/include/Kyoto/Alloc/CGameAllocator.hpp index ff742574..eea7123b 100644 --- a/include/Kyoto/Alloc/CGameAllocator.hpp +++ b/include/Kyoto/Alloc/CGameAllocator.hpp @@ -70,23 +70,23 @@ public: bool Initialize(COsContext& ctx); void Shutdown(); - void* Alloc(size_t size, EHint hint, EScope scope, EType type, const CCallStack& cs); + void* Alloc(size_t size, EHint hint, EScope scope, EType type, const CCallStack& cs) override; SGameMemInfo* FindFreeBlock(uint); SGameMemInfo* FindFreeBlockFromTopOfHeap(uint); uint FixupAllocPtrs(SGameMemInfo*, uint, uint, EHint, const CCallStack&); void UpdateAllocDebugStats(unsigned int, unsigned int, unsigned int); - bool Free(const void* ptr); + bool Free(const void* ptr) override; bool FreeNormalAllocation(const void* ptr); - void ReleaseAll(); + void ReleaseAll() override; void* AllocSecondary(size_t size, EHint hint, EScope scope, EType type, - const CCallStack& cs); - bool FreeSecondary(const void* ptr); - void ReleaseAllSecondary(); - void SetOutOfMemoryCallback(FOutOfMemoryCb cb, const void* target); - int EnumAllocations(FEnumAllocationsCb func, const void* ptr, bool b) const; - SAllocInfo GetAllocInfo(const void* ptr) const; - SMetrics GetMetrics() const; - void OffsetFakeStatics(int offset); + const CCallStack& cs) override; + bool FreeSecondary(const void* ptr) override; + void ReleaseAllSecondary() override; + void SetOutOfMemoryCallback(FOutOfMemoryCb cb, const void* target) override; + int EnumAllocations(FEnumAllocationsCb func, const void* ptr, bool b) const override; + SAllocInfo GetAllocInfo(const void* ptr) const override; + SMetrics GetMetrics() const override; + void OffsetFakeStatics(int offset) override; static uint GetFreeBinEntryForSize(uint); void AddFreeEntryToFreeList(SGameMemInfo*); diff --git a/include/Kyoto/Input/CDolphinController.hpp b/include/Kyoto/Input/CDolphinController.hpp index b4c40e12..ea4d29ce 100644 --- a/include/Kyoto/Input/CDolphinController.hpp +++ b/include/Kyoto/Input/CDolphinController.hpp @@ -11,12 +11,12 @@ class CDolphinController : public IController { public: CDolphinController(); - ~CDolphinController(); - void Poll(); - uint GetDeviceCount() const; - CControllerGamepadData& GetGamepadData(int controller); - uint GetControllerType(int) const; - void SetMotorState(EIOPort port, EMotorState state); + ~CDolphinController() override; + void Poll() override; + uint GetDeviceCount() const override; + CControllerGamepadData& GetGamepadData(int controller) override; + uint GetControllerType(int) const override; + void SetMotorState(EIOPort port, EMotorState state) override; bool Initialize(); float GetAnalogStickMaxValue(EJoyAxis axis) const; diff --git a/include/Kyoto/Particles/CColorElement.hpp b/include/Kyoto/Particles/CColorElement.hpp index a3c616b4..4bf917a5 100644 --- a/include/Kyoto/Particles/CColorElement.hpp +++ b/include/Kyoto/Particles/CColorElement.hpp @@ -14,8 +14,8 @@ class CCEConstant : public CColorElement { public: CCEConstant(CRealElement* r, CRealElement* g, CRealElement* b, CRealElement* a); - ~CCEConstant(); - bool GetValue(int frame, CColor& colorOut) const; + ~CCEConstant() override; + bool GetValue(int frame, CColor& colorOut) const override; }; class CCEFastConstant : public CColorElement { @@ -23,8 +23,8 @@ class CCEFastConstant : public CColorElement { public: CCEFastConstant(float r, float g, float b, float a); - ~CCEFastConstant(); - bool GetValue(int frame, CColor& colorOut) const; + ~CCEFastConstant() override; + bool GetValue(int frame, CColor& colorOut) const override; }; class CCEFade : public CColorElement { @@ -34,8 +34,8 @@ class CCEFade : public CColorElement { public: CCEFade(CColorElement* a, CColorElement* b, CRealElement* end); - ~CCEFade(); - bool GetValue(int frame, CColor& colorOut) const; + ~CCEFade() override; + bool GetValue(int frame, CColor& colorOut) const override; }; class CCEFadeEnd : public CColorElement { @@ -46,8 +46,8 @@ class CCEFadeEnd : public CColorElement { public: CCEFadeEnd(CColorElement* a, CColorElement* b, CRealElement* start, CRealElement* end); - ~CCEFadeEnd(); - bool GetValue(int frame, CColor& colorOut) const; + ~CCEFadeEnd() override; + bool GetValue(int frame, CColor& colorOut) const override; }; class CCETimeChain : public CColorElement { @@ -57,8 +57,8 @@ class CCETimeChain : public CColorElement { public: CCETimeChain(CColorElement* a, CColorElement* b, CIntElement* c); - ~CCETimeChain(); - bool GetValue(int frame, CColor& colorOut) const; + ~CCETimeChain() override; + bool GetValue(int frame, CColor& colorOut) const override; }; class CCEPulse : public CColorElement { @@ -69,8 +69,8 @@ class CCEPulse : public CColorElement { public: CCEPulse(CIntElement* a, CIntElement* b, CColorElement* c, CColorElement* d); - ~CCEPulse(); - bool GetValue(int frame, CColor& colorOut) const; + ~CCEPulse() override; + bool GetValue(int frame, CColor& colorOut) const override; }; class CCEKeyframeEmitter : public CColorElement { @@ -84,14 +84,14 @@ class CCEKeyframeEmitter : public CColorElement { public: CCEKeyframeEmitter(CInputStream& in); - ~CCEKeyframeEmitter(); - bool GetValue(int frame, CColor& valOut) const; + ~CCEKeyframeEmitter() override; + bool GetValue(int frame, CColor& valOut) const override; }; class CCEParticleColor : public CColorElement { public: - ~CCEParticleColor() {} - bool GetValue(int frame, CColor& colorOut) const; + ~CCEParticleColor() override {} + bool GetValue(int frame, CColor& colorOut) const override; }; #endif // _CCOLORELEMENT diff --git a/include/Kyoto/Particles/CElementGen.hpp b/include/Kyoto/Particles/CElementGen.hpp index 47df80d9..fdc66e49 100644 --- a/include/Kyoto/Particles/CElementGen.hpp +++ b/include/Kyoto/Particles/CElementGen.hpp @@ -43,34 +43,34 @@ public: CElementGen(TToken< CGenDescription >, EModelOrientationType = kMOT_Normal, EOptionalSystemFlags = kOSF_One); - ~CElementGen(); + ~CElementGen() override; - virtual void Update(double); - virtual void Render() const; - virtual void SetOrientation(const CTransform4f& orientation); - virtual void SetTranslation(const CVector3f& translation); - virtual void SetGlobalOrientation(const CTransform4f& orientation); - virtual void SetGlobalTranslation(const CVector3f& translation); - virtual void SetGlobalScale(const CVector3f& scale); - virtual void SetLocalScale(const CVector3f& scale); - virtual void SetParticleEmission(bool emission); - virtual void SetModulationColor(const CColor& col); - virtual void SetGeneratorRate(float rate) {} - virtual const CTransform4f& GetOrientation() const; - virtual const CVector3f& GetTranslation() const; - virtual CTransform4f GetGlobalOrientation() const; - virtual CVector3f GetGlobalTranslation() const; - virtual CVector3f GetGlobalScale() const; - virtual bool GetParticleEmission() const; - virtual CColor GetModulationColor() const; - virtual bool IsSystemDeletable() const; - virtual rstl::optional_object GetBounds() const; - virtual int GetParticleCount() const; - virtual bool SystemHasLight() const; - virtual CLight GetLight(); - virtual void DestroyParticles(); - virtual void AddModifier(CWarp*); - virtual uint Get4CharId() const; + virtual void Update(double) override; + virtual void Render() const override; + virtual void SetOrientation(const CTransform4f& orientation) override; + virtual void SetTranslation(const CVector3f& translation) override; + virtual void SetGlobalOrientation(const CTransform4f& orientation) override; + virtual void SetGlobalTranslation(const CVector3f& translation) override; + virtual void SetGlobalScale(const CVector3f& scale) override; + virtual void SetLocalScale(const CVector3f& scale) override; + virtual void SetParticleEmission(bool emission) override; + virtual void SetModulationColor(const CColor& col) override; + virtual void SetGeneratorRate(float rate) override {} + virtual const CTransform4f& GetOrientation() const override; + virtual const CVector3f& GetTranslation() const override; + virtual CTransform4f GetGlobalOrientation() const override; + virtual CVector3f GetGlobalTranslation() const override; + virtual CVector3f GetGlobalScale() const override; + virtual bool GetParticleEmission() const override; + virtual CColor GetModulationColor() const override; + virtual bool IsSystemDeletable() const override; + virtual rstl::optional_object GetBounds() const override; + virtual int GetParticleCount() const override; + virtual bool SystemHasLight() const override; + virtual CLight GetLight() override; + virtual void DestroyParticles() override; + virtual void AddModifier(CWarp*) override; + virtual uint Get4CharId() const override; int GetEmitterTime() const; int GetSystemCount(); diff --git a/include/Kyoto/Particles/CIntElement.hpp b/include/Kyoto/Particles/CIntElement.hpp index 31044c69..bf6ddb97 100644 --- a/include/Kyoto/Particles/CIntElement.hpp +++ b/include/Kyoto/Particles/CIntElement.hpp @@ -14,8 +14,8 @@ class CIEConstant : public CIntElement { public: CIEConstant(int val); - ~CIEConstant(); - bool GetValue(int frame, int& valOut) const; + ~CIEConstant() override; + bool GetValue(int frame, int& valOut) const override; }; class CIEDeath : public CIntElement { @@ -24,8 +24,8 @@ class CIEDeath : public CIntElement { public: CIEDeath(CIntElement* a, CIntElement* b); - ~CIEDeath(); - bool GetValue(int frame, int& valOut) const; + ~CIEDeath() override; + bool GetValue(int frame, int& valOut) const override; }; class CIEAdd : public CIntElement { @@ -34,8 +34,8 @@ class CIEAdd : public CIntElement { public: CIEAdd(CIntElement* a, CIntElement* b); - ~CIEAdd(); - bool GetValue(int frame, int& valOut) const; + ~CIEAdd() override; + bool GetValue(int frame, int& valOut) const override; }; class CIEMultiply : public CIntElement { @@ -44,8 +44,8 @@ class CIEMultiply : public CIntElement { public: CIEMultiply(CIntElement* a, CIntElement* b); - ~CIEMultiply(); - bool GetValue(int frame, int& valOut) const; + ~CIEMultiply() override; + bool GetValue(int frame, int& valOut) const override; }; class CIEModulo : public CIntElement { @@ -54,8 +54,8 @@ class CIEModulo : public CIntElement { public: CIEModulo(CIntElement* a, CIntElement* b); - ~CIEModulo(); - bool GetValue(int frame, int& valOut) const; + ~CIEModulo() override; + bool GetValue(int frame, int& valOut) const override; }; class CIERandom : public CIntElement { @@ -64,8 +64,8 @@ class CIERandom : public CIntElement { public: CIERandom(CIntElement* a, CIntElement* b); - ~CIERandom(); - bool GetValue(int frame, int& valOut) const; + ~CIERandom() override; + bool GetValue(int frame, int& valOut) const override; }; class CIESampleAndHold : public CIntElement { @@ -77,8 +77,8 @@ class CIESampleAndHold : public CIntElement { public: CIESampleAndHold(CIntElement* a, CIntElement* b, CIntElement* c); - ~CIESampleAndHold(); - bool GetValue(int frame, int& valOut) const; + ~CIESampleAndHold() override; + bool GetValue(int frame, int& valOut) const override; }; class CIEImpulse : public CIntElement { @@ -86,8 +86,8 @@ class CIEImpulse : public CIntElement { public: CIEImpulse(CIntElement* a); - ~CIEImpulse(); - bool GetValue(int frame, int& valOut) const; + ~CIEImpulse() override; + bool GetValue(int frame, int& valOut) const override; }; class CIETimescale : public CIntElement { @@ -96,7 +96,7 @@ class CIETimescale : public CIntElement { public: CIETimescale(CRealElement* a); ~CIETimescale(); - bool GetValue(int frame, int& valOut) const; + bool GetValue(int frame, int& valOut) const override; }; class CIEInitialRandom : public CIntElement { @@ -105,8 +105,8 @@ class CIEInitialRandom : public CIntElement { public: CIEInitialRandom(CIntElement* a, CIntElement* b); - ~CIEInitialRandom(); - bool GetValue(int frame, int& valOut) const; + ~CIEInitialRandom() override; + bool GetValue(int frame, int& valOut) const override; }; class CIETimeChain : public CIntElement { @@ -116,8 +116,8 @@ class CIETimeChain : public CIntElement { public: CIETimeChain(CIntElement* a, CIntElement* b, CIntElement* c); - ~CIETimeChain(); - bool GetValue(int frame, int& valOut) const; + ~CIETimeChain() override; + bool GetValue(int frame, int& valOut) const override; }; class CIEClamp : public CIntElement { @@ -127,8 +127,8 @@ class CIEClamp : public CIntElement { public: CIEClamp(CIntElement* a, CIntElement* b, CIntElement* c); - ~CIEClamp(); - bool GetValue(int frame, int& valOut) const; + ~CIEClamp() override; + bool GetValue(int frame, int& valOut) const override; }; class CIEPulse : public CIntElement { @@ -139,8 +139,8 @@ class CIEPulse : public CIntElement { public: CIEPulse(CIntElement* a, CIntElement* b, CIntElement* c, CIntElement* d); - ~CIEPulse(); - bool GetValue(int frame, int& valOut) const; + ~CIEPulse() override; + bool GetValue(int frame, int& valOut) const override; }; class CIELifetimePercent : public CIntElement { @@ -148,8 +148,8 @@ class CIELifetimePercent : public CIntElement { public: CIELifetimePercent(CIntElement* a); - ~CIELifetimePercent(); - bool GetValue(int frame, int& valOut) const; + ~CIELifetimePercent() override; + bool GetValue(int frame, int& valOut) const override; }; class CIEKeyframeEmitter : public CIntElement { @@ -163,8 +163,8 @@ class CIEKeyframeEmitter : public CIntElement { public: CIEKeyframeEmitter(CInputStream& in); - ~CIEKeyframeEmitter(); - bool GetValue(int frame, int& valOut) const; + ~CIEKeyframeEmitter() override; + bool GetValue(int frame, int& valOut) const override; }; class CIESubtract : public CIntElement { @@ -173,8 +173,8 @@ class CIESubtract : public CIntElement { public: CIESubtract(CIntElement* a, CIntElement* b); - ~CIESubtract(); - bool GetValue(int frame, int& valOut) const; + ~CIESubtract() override; + bool GetValue(int frame, int& valOut) const override; }; class CIERealToInt : public CIntElement { @@ -183,26 +183,26 @@ class CIERealToInt : public CIntElement { public: CIERealToInt(CRealElement* a, CRealElement* b); - ~CIERealToInt(); - bool GetValue(int frame, int& valOut) const; + ~CIERealToInt() override; + bool GetValue(int frame, int& valOut) const override; }; class CIEGetCumulativeParticleCount : public CIntElement { public: - ~CIEGetCumulativeParticleCount() {} - bool GetValue(int frame, int& valOut) const; + ~CIEGetCumulativeParticleCount() override {} + bool GetValue(int frame, int& valOut) const override; }; class CIEGetActiveParticleCount : public CIntElement { public: - ~CIEGetActiveParticleCount() {} - bool GetValue(int frame, int& valOut) const; + ~CIEGetActiveParticleCount() override {} + bool GetValue(int frame, int& valOut) const override; }; class CIEGetEmitterTime : public CIntElement { public: - ~CIEGetEmitterTime(); - bool GetValue(int frame, int& valOut) const; + ~CIEGetEmitterTime() override; + bool GetValue(int frame, int& valOut) const override; }; #endif // _CINTELEMENT diff --git a/include/Kyoto/Particles/CModVectorElement.hpp b/include/Kyoto/Particles/CModVectorElement.hpp index 2c232d0b..74f4141a 100644 --- a/include/Kyoto/Particles/CModVectorElement.hpp +++ b/include/Kyoto/Particles/CModVectorElement.hpp @@ -13,8 +13,8 @@ class CMVEConstant : public CModVectorElement { public: CMVEConstant(CRealElement* a, CRealElement* b, CRealElement* c); - ~CMVEConstant(); - bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const; + ~CMVEConstant() override; + bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const override; }; class CMVEFastConstant : public CModVectorElement { @@ -22,8 +22,8 @@ class CMVEFastConstant : public CModVectorElement { public: CMVEFastConstant(float a, float b, float c); - ~CMVEFastConstant(); - bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const; + ~CMVEFastConstant() override; + bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const override; }; class CMVEGravity : public CModVectorElement { @@ -31,8 +31,8 @@ class CMVEGravity : public CModVectorElement { public: CMVEGravity(CVectorElement* a); - ~CMVEGravity(); - bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const; + ~CMVEGravity() override; + bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const override; }; class CMVEWind : public CModVectorElement { @@ -41,8 +41,8 @@ class CMVEWind : public CModVectorElement { public: CMVEWind(CVectorElement* velocity, CRealElement* factor); - ~CMVEWind(); - bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const; + ~CMVEWind() override; + bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const override; }; class CMVEExplode : public CModVectorElement { @@ -51,8 +51,8 @@ class CMVEExplode : public CModVectorElement { public: CMVEExplode(CRealElement* a, CRealElement* b); - ~CMVEExplode(); - bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const; + ~CMVEExplode() override; + bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const override; }; class CMVETimeChain : public CModVectorElement { @@ -62,8 +62,8 @@ class CMVETimeChain : public CModVectorElement { public: CMVETimeChain(CModVectorElement* a, CModVectorElement* b, CIntElement* c); - ~CMVETimeChain(); - bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const; + ~CMVETimeChain() override; + bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const override; }; class CMVEPulse : public CModVectorElement { @@ -74,8 +74,8 @@ class CMVEPulse : public CModVectorElement { public: CMVEPulse(CIntElement* a, CIntElement* b, CModVectorElement* c, CModVectorElement* d); - ~CMVEPulse(); - bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const; + ~CMVEPulse() override; + bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const override; }; class CMVEImplosion : public CModVectorElement { @@ -87,8 +87,8 @@ class CMVEImplosion : public CModVectorElement { public: CMVEImplosion(CVectorElement* a, CRealElement* b, CRealElement* c, CRealElement* d, bool e); - ~CMVEImplosion(); - bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const; + ~CMVEImplosion() override; + bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const override; }; class CMVELinearImplosion : public CModVectorElement { @@ -100,8 +100,8 @@ class CMVELinearImplosion : public CModVectorElement { public: CMVELinearImplosion(CVectorElement* a, CRealElement* b, CRealElement* c, CRealElement* d, bool e); - ~CMVELinearImplosion(); - bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const; + ~CMVELinearImplosion() override; + bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const override; }; class CMVEExponentialImplosion : public CModVectorElement { @@ -114,8 +114,8 @@ class CMVEExponentialImplosion : public CModVectorElement { public: CMVEExponentialImplosion(CVectorElement* a, CRealElement* b, CRealElement* c, CRealElement* d, bool e); - ~CMVEExponentialImplosion(); - bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const; + ~CMVEExponentialImplosion() override; + bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const override; }; class CMVESwirl : public CModVectorElement { @@ -126,8 +126,8 @@ class CMVESwirl : public CModVectorElement { public: CMVESwirl(CVectorElement* a, CVectorElement* b, CRealElement* c, CRealElement* d); - ~CMVESwirl(); - bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const; + ~CMVESwirl() override; + bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const override; }; class CMVEBounce : public CModVectorElement { @@ -143,8 +143,8 @@ class CMVEBounce : public CModVectorElement { public: CMVEBounce(CVectorElement* planePoint, CVectorElement* planeNormal, CRealElement* friction, CRealElement* restitution, bool e); - ~CMVEBounce(); - bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const; + ~CMVEBounce() override; + bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const override; }; class CMVESetPosition : public CModVectorElement { @@ -152,8 +152,8 @@ class CMVESetPosition : public CModVectorElement { public: CMVESetPosition(CVectorElement* a); - ~CMVESetPosition(); - bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const; + ~CMVESetPosition() override; + bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const override; }; #endif // _CMODVECTORELEMENT diff --git a/include/Kyoto/Particles/CParticleElectric.hpp b/include/Kyoto/Particles/CParticleElectric.hpp index 347496a8..127bc2aa 100644 --- a/include/Kyoto/Particles/CParticleElectric.hpp +++ b/include/Kyoto/Particles/CParticleElectric.hpp @@ -11,33 +11,33 @@ class CParticleElectric : public CParticleGen { public: explicit CParticleElectric(TToken desc); - ~CParticleElectric(); - void Update(double); - void Render() const; - void SetOrientation(const CTransform4f& orientation); - void SetTranslation(const CVector3f& translation); - void SetGlobalOrientation(const CTransform4f& orientation); - void SetGlobalTranslation(const CVector3f& translation); - void SetGlobalScale(const CVector3f& scale); - void SetLocalScale(const CVector3f& scale); - void SetParticleEmission(bool emission); - void SetModulationColor(const CColor& col); + ~CParticleElectric() override; + void Update(double) override; + void Render() const override; + void SetOrientation(const CTransform4f& orientation) override; + void SetTranslation(const CVector3f& translation) override; + void SetGlobalOrientation(const CTransform4f& orientation) override; + void SetGlobalTranslation(const CVector3f& translation) override; + void SetGlobalScale(const CVector3f& scale) override; + void SetLocalScale(const CVector3f& scale) override; + void SetParticleEmission(bool emission) override; + void SetModulationColor(const CColor& col) override; void SetGeneratorRate(float rate) {} - const CTransform4f& GetOrientation() const; - const CVector3f& GetTranslation() const; - CTransform4f GetGlobalOrientation() const; - CVector3f GetGlobalTranslation() const; - CVector3f GetGlobalScale() const; - bool GetParticleEmission() const; - CColor GetModulationColor() const; - bool IsSystemDeletable() const; - rstl::optional_object GetBounds() const; - int GetParticleCount() const; - bool SystemHasLight() const; - CLight GetLight(); - void DestroyParticles(); - void AddModifier(CWarp*); - uint Get4CharId() const; + const CTransform4f& GetOrientation() const override; + const CVector3f& GetTranslation() const override; + CTransform4f GetGlobalOrientation() const override; + CVector3f GetGlobalTranslation() const override; + CVector3f GetGlobalScale() const override; + bool GetParticleEmission() const override; + CColor GetModulationColor() const override; + bool IsSystemDeletable() const override; + rstl::optional_object GetBounds() const override; + int GetParticleCount() const override; + bool SystemHasLight() const override; + CLight GetLight() override; + void DestroyParticles() override; + void AddModifier(CWarp*) override; + uint Get4CharId() const override; void SetOverrideIPos(const CVector3f& vec) { x178_overrideIPos = vec; } diff --git a/include/Kyoto/Particles/CRealElement.hpp b/include/Kyoto/Particles/CRealElement.hpp index 52bb560c..61c0259a 100644 --- a/include/Kyoto/Particles/CRealElement.hpp +++ b/include/Kyoto/Particles/CRealElement.hpp @@ -12,9 +12,9 @@ class CREConstant : public CRealElement { public: CREConstant(float val); - ~CREConstant(); - bool GetValue(int frame, float& valOut) const; - bool IsConstant() const { return true; } + ~CREConstant() override; + bool GetValue(int frame, float& valOut) const override; + bool IsConstant() const override { return true; } }; class CRESineWave : public CRealElement { @@ -24,8 +24,8 @@ class CRESineWave : public CRealElement { public: CRESineWave(CRealElement* a, CRealElement* b, CRealElement* c); - ~CRESineWave(); - bool GetValue(int frame, float& valOut) const; + ~CRESineWave() override; + bool GetValue(int frame, float& valOut) const override; }; class CRETimeScale : public CRealElement { @@ -33,8 +33,8 @@ class CRETimeScale : public CRealElement { public: CRETimeScale(CRealElement* a); - ~CRETimeScale(); - bool GetValue(int frame, float& valOut) const; + ~CRETimeScale() override; + bool GetValue(int frame, float& valOut) const override; }; class CREAdd : public CRealElement { @@ -43,8 +43,8 @@ class CREAdd : public CRealElement { public: CREAdd(CRealElement* a, CRealElement* b); - ~CREAdd(); - bool GetValue(int frame, float& valOut) const; + ~CREAdd() override; + bool GetValue(int frame, float& valOut) const override; }; class CREMultiply : public CRealElement { @@ -53,8 +53,8 @@ class CREMultiply : public CRealElement { public: CREMultiply(CRealElement* a, CRealElement* b); - ~CREMultiply(); - bool GetValue(int frame, float& valOut) const; + ~CREMultiply() override; + bool GetValue(int frame, float& valOut) const override; }; class CREDotProduct : public CRealElement { @@ -63,8 +63,8 @@ class CREDotProduct : public CRealElement { public: CREDotProduct(CVectorElement* a, CVectorElement* b); - ~CREDotProduct(); - bool GetValue(int frame, float& valOut) const; + ~CREDotProduct() override; + bool GetValue(int frame, float& valOut) const override; }; class CRERandom : public CRealElement { @@ -73,8 +73,8 @@ class CRERandom : public CRealElement { public: CRERandom(CRealElement* min, CRealElement* max); - ~CRERandom(); - bool GetValue(int frame, float& valOut) const; + ~CRERandom() override; + bool GetValue(int frame, float& valOut) const override; }; class CREInitialRandom : public CRealElement { @@ -83,9 +83,9 @@ class CREInitialRandom : public CRealElement { public: CREInitialRandom(CRealElement* min, CRealElement* max); - ~CREInitialRandom(); - bool GetValue(int frame, float& valOut) const; - bool IsConstant() const { return true; } + ~CREInitialRandom() override; + bool GetValue(int frame, float& valOut) const override; + bool IsConstant() const override { return true; } }; class CRETimeChain : public CRealElement { @@ -95,8 +95,8 @@ class CRETimeChain : public CRealElement { public: CRETimeChain(CRealElement* a, CRealElement* b, CIntElement* c); - ~CRETimeChain(); - bool GetValue(int frame, float& valOut) const; + ~CRETimeChain() override; + bool GetValue(int frame, float& valOut) const override; }; class CREClamp : public CRealElement { @@ -106,8 +106,8 @@ class CREClamp : public CRealElement { public: CREClamp(CRealElement* a, CRealElement* b, CRealElement* c); - ~CREClamp(); - bool GetValue(int frame, float& valOut) const; + ~CREClamp() override; + bool GetValue(int frame, float& valOut) const override; }; class CREPulse : public CRealElement { @@ -118,8 +118,8 @@ class CREPulse : public CRealElement { public: CREPulse(CIntElement* a, CIntElement* b, CRealElement* c, CRealElement* d); - ~CREPulse(); - bool GetValue(int frame, float& valOut) const; + ~CREPulse() override; + bool GetValue(int frame, float& valOut) const override; }; class CRELifetimePercent : public CRealElement { @@ -127,8 +127,8 @@ class CRELifetimePercent : public CRealElement { public: CRELifetimePercent(CRealElement* a); // : x4_percentVal(a) {} - ~CRELifetimePercent(); - bool GetValue(int frame, float& valOut) const; + ~CRELifetimePercent() override; + bool GetValue(int frame, float& valOut) const override; }; class CRELifetimeTween : public CRealElement { @@ -137,8 +137,8 @@ class CRELifetimeTween : public CRealElement { public: CRELifetimeTween(CRealElement* a, CRealElement* b); - ~CRELifetimeTween(); - bool GetValue(int frame, float& valOut) const; + ~CRELifetimeTween() override; + bool GetValue(int frame, float& valOut) const override; }; class CREKeyframeEmitter : public CRealElement { @@ -152,68 +152,68 @@ class CREKeyframeEmitter : public CRealElement { public: CREKeyframeEmitter(CInputStream& in); - ~CREKeyframeEmitter(); - bool GetValue(int frame, float& valOut) const; + ~CREKeyframeEmitter() override; + bool GetValue(int frame, float& valOut) const override; }; class CREParticleAccessParameter1 : public CRealElement { public: - ~CREParticleAccessParameter1() {} - bool GetValue(int frame, float& valOut) const; + ~CREParticleAccessParameter1() override {} + bool GetValue(int frame, float& valOut) const override; }; class CREParticleAccessParameter2 : public CRealElement { public: - ~CREParticleAccessParameter2() {} - bool GetValue(int frame, float& valOut) const; + ~CREParticleAccessParameter2() override {} + bool GetValue(int frame, float& valOut) const override; }; class CREParticleAccessParameter3 : public CRealElement { public: - ~CREParticleAccessParameter3() {} - bool GetValue(int frame, float& valOut) const; + ~CREParticleAccessParameter3() override {} + bool GetValue(int frame, float& valOut) const override; }; class CREParticleAccessParameter4 : public CRealElement { public: - ~CREParticleAccessParameter4() {} - bool GetValue(int frame, float& valOut) const; + ~CREParticleAccessParameter4() override {} + bool GetValue(int frame, float& valOut) const override; }; class CREParticleAccessParameter5 : public CRealElement { public: - ~CREParticleAccessParameter5() {} - bool GetValue(int frame, float& valOut) const; + ~CREParticleAccessParameter5() override {} + bool GetValue(int frame, float& valOut) const override; }; class CREParticleAccessParameter6 : public CRealElement { public: - ~CREParticleAccessParameter6() {} - bool GetValue(int frame, float& valOut) const; + ~CREParticleAccessParameter6() override {} + bool GetValue(int frame, float& valOut) const override; }; class CREParticleAccessParameter7 : public CRealElement { public: - ~CREParticleAccessParameter7() {} - bool GetValue(int frame, float& valOut) const; + ~CREParticleAccessParameter7() override {} + bool GetValue(int frame, float& valOut) const override; }; class CREParticleAccessParameter8 : public CRealElement { public: - ~CREParticleAccessParameter8() {} - bool GetValue(int frame, float& valOut) const; + ~CREParticleAccessParameter8() override {} + bool GetValue(int frame, float& valOut) const override; }; class CREParticleSizeOrLineLength : public CRealElement { public: - ~CREParticleSizeOrLineLength() {} - bool GetValue(int frame, float& valOut) const; + ~CREParticleSizeOrLineLength() override {} + bool GetValue(int frame, float& valOut) const override; }; class CREParticleRotationOrLineWidth : public CRealElement { public: - ~CREParticleRotationOrLineWidth() {} - bool GetValue(int frame, float& valOut) const; + ~CREParticleRotationOrLineWidth() override {} + bool GetValue(int frame, float& valOut) const override; }; class CREVectorXToReal : public CRealElement { @@ -221,8 +221,8 @@ class CREVectorXToReal : public CRealElement { public: CREVectorXToReal(CVectorElement* a); - ~CREVectorXToReal(); - bool GetValue(int frame, float& valOut) const; + ~CREVectorXToReal() override; + bool GetValue(int frame, float& valOut) const override; }; class CREVectorYToReal : public CRealElement { @@ -230,8 +230,8 @@ class CREVectorYToReal : public CRealElement { public: CREVectorYToReal(CVectorElement* a); - ~CREVectorYToReal(); - bool GetValue(int frame, float& valOut) const; + ~CREVectorYToReal() override; + bool GetValue(int frame, float& valOut) const override; }; class CREVectorZToReal : public CRealElement { @@ -239,8 +239,8 @@ class CREVectorZToReal : public CRealElement { public: CREVectorZToReal(CVectorElement* a); - ~CREVectorZToReal(); - bool GetValue(int frame, float& valOut) const; + ~CREVectorZToReal() override; + bool GetValue(int frame, float& valOut) const override; }; class CREVectorMagnitude : public CRealElement { @@ -248,8 +248,8 @@ class CREVectorMagnitude : public CRealElement { public: CREVectorMagnitude(CVectorElement* a); - ~CREVectorMagnitude(); - bool GetValue(int frame, float& valOut) const; + ~CREVectorMagnitude() override; + bool GetValue(int frame, float& valOut) const override; }; class CREInitialSwitch : public CRealElement { @@ -258,8 +258,8 @@ class CREInitialSwitch : public CRealElement { public: CREInitialSwitch(CRealElement* a, CRealElement* b); - ~CREInitialSwitch(); - bool GetValue(int frame, float& valOut) const; + ~CREInitialSwitch() override; + bool GetValue(int frame, float& valOut) const override; }; class CRECompareLessThan : public CRealElement { @@ -270,8 +270,8 @@ class CRECompareLessThan : public CRealElement { public: CRECompareLessThan(CRealElement* a, CRealElement* b, CRealElement* c, CRealElement* d); - ~CRECompareLessThan(); - bool GetValue(int frame, float& valOut) const; + ~CRECompareLessThan() override; + bool GetValue(int frame, float& valOut) const override; }; class CRECompareEqual : public CRealElement { @@ -282,8 +282,8 @@ class CRECompareEqual : public CRealElement { public: CRECompareEqual(CRealElement* a, CRealElement* b, CRealElement* c, CRealElement* d); - ~CRECompareEqual(); - bool GetValue(int frame, float& valOut) const; + ~CRECompareEqual() override; + bool GetValue(int frame, float& valOut) const override; }; class CREConstantRange : public CRealElement { @@ -296,8 +296,8 @@ class CREConstantRange : public CRealElement { public: CREConstantRange(CRealElement* a, CRealElement* b, CRealElement* c, CRealElement* d, CRealElement* e); - ~CREConstantRange(); - bool GetValue(int frame, float& valOut) const; + ~CREConstantRange() override; + bool GetValue(int frame, float& valOut) const override; }; class CREExternalVar : public CRealElement { @@ -305,8 +305,8 @@ class CREExternalVar : public CRealElement { public: CREExternalVar(CIntElement* a); - ~CREExternalVar(); - bool GetValue(int frame, float& valOut) const; + ~CREExternalVar() override; + bool GetValue(int frame, float& valOut) const override; }; class CRESubtract : public CRealElement { @@ -315,8 +315,8 @@ class CRESubtract : public CRealElement { public: CRESubtract(CRealElement* a, CRealElement* b); - ~CRESubtract(); - bool GetValue(int frame, float& valOut) const; + ~CRESubtract() override; + bool GetValue(int frame, float& valOut) const override; }; class CREGetComponentRed : public CRealElement { @@ -324,8 +324,8 @@ class CREGetComponentRed : public CRealElement { public: CREGetComponentRed(CColorElement* a); - ~CREGetComponentRed(); - bool GetValue(int frame, float& valOut) const; + ~CREGetComponentRed() override; + bool GetValue(int frame, float& valOut) const override; }; class CREGetComponentGreen : public CRealElement { @@ -333,8 +333,8 @@ class CREGetComponentGreen : public CRealElement { public: CREGetComponentGreen(CColorElement* a); - ~CREGetComponentGreen(); - bool GetValue(int frame, float& valOut) const; + ~CREGetComponentGreen() override; + bool GetValue(int frame, float& valOut) const override; }; class CREGetComponentBlue : public CRealElement { @@ -342,8 +342,8 @@ class CREGetComponentBlue : public CRealElement { public: CREGetComponentBlue(CColorElement* a); - ~CREGetComponentBlue(); - bool GetValue(int frame, float& valOut) const; + ~CREGetComponentBlue() override; + bool GetValue(int frame, float& valOut) const override; }; class CREGetComponentAlpha : public CRealElement { @@ -351,8 +351,8 @@ class CREGetComponentAlpha : public CRealElement { public: CREGetComponentAlpha(CColorElement* a); - ~CREGetComponentAlpha(); - bool GetValue(int frame, float& valOut) const; + ~CREGetComponentAlpha() override; + bool GetValue(int frame, float& valOut) const override; }; class CREIntTimesReal : public CRealElement { @@ -361,8 +361,8 @@ class CREIntTimesReal : public CRealElement { public: CREIntTimesReal(CIntElement* a, CRealElement* b); - ~CREIntTimesReal(); - bool GetValue(int frame, float& valOut) const; + ~CREIntTimesReal() override; + bool GetValue(int frame, float& valOut) const override; }; #endif // _CREALELEMENT diff --git a/include/Kyoto/Particles/CUVElement.hpp b/include/Kyoto/Particles/CUVElement.hpp index 27459703..c7ae5384 100644 --- a/include/Kyoto/Particles/CUVElement.hpp +++ b/include/Kyoto/Particles/CUVElement.hpp @@ -13,11 +13,11 @@ class CUVEConstant : public CUVElement { public: CUVEConstant(TToken< CTexture > tex); - ~CUVEConstant(); - TLockedToken< CTexture > GetValueTexture(int frame) const; - void GetValueUV(int frame, SUVElementSet& valOut) const; - bool HasConstantTexture() const { return true; } - bool HasConstantUV() const { return true; } + ~CUVEConstant() override; + TLockedToken< CTexture > GetValueTexture(int frame) const override; + void GetValueUV(int frame, SUVElementSet& valOut) const override; + bool HasConstantTexture() const override { return true; } + bool HasConstantUV() const override { return true; } }; class CUVEAnimTexture : public CUVElement { @@ -34,11 +34,11 @@ class CUVEAnimTexture : public CUVElement { public: CUVEAnimTexture(TToken< CTexture > tex, CIntElement* tileW, CIntElement* tileH, CIntElement* strideW, CIntElement* strideH, CIntElement* cycleFrames, bool loop); - ~CUVEAnimTexture(); - TLockedToken< CTexture > GetValueTexture(int frame) const; - void GetValueUV(int frame, SUVElementSet& valOut) const; - bool HasConstantTexture() const { return true; } - bool HasConstantUV() const { return false; } + ~CUVEAnimTexture() override; + TLockedToken< CTexture > GetValueTexture(int frame) const override; + void GetValueUV(int frame, SUVElementSet& valOut) const override; + bool HasConstantTexture() const override { return true; } + bool HasConstantUV() const override { return false; } }; #endif // _CUVELEMENT diff --git a/include/Kyoto/Particles/CVectorElement.hpp b/include/Kyoto/Particles/CVectorElement.hpp index f3d47c5a..0145bd99 100644 --- a/include/Kyoto/Particles/CVectorElement.hpp +++ b/include/Kyoto/Particles/CVectorElement.hpp @@ -11,9 +11,9 @@ class CVEFastConstant : public CVectorElement { public: CVEFastConstant(float x, float y, float z); - ~CVEFastConstant(); - bool GetValue(int frame, CVector3f& valOut) const; - bool IsFastConstant() const { return true; } + ~CVEFastConstant() override; + bool GetValue(int frame, CVector3f& valOut) const override; + bool IsFastConstant() const override { return true; } private: CVector3f x4_val; @@ -21,51 +21,51 @@ private: class CVEParticleLocation : public CVectorElement { public: - ~CVEParticleLocation() {} - bool GetValue(int frame, CVector3f& valOut) const; + ~CVEParticleLocation() override {} + bool GetValue(int frame, CVector3f& valOut) const override; }; class CVEParticleColor : public CVectorElement { public: - ~CVEParticleColor() {} - bool GetValue(int frame, CVector3f& valOut) const; + ~CVEParticleColor() override {} + bool GetValue(int frame, CVector3f& valOut) const override; }; class CVEParticleVelocity : public CVectorElement { public: - ~CVEParticleVelocity() {} - bool GetValue(int frame, CVector3f& valOut) const; + ~CVEParticleVelocity() override {} + bool GetValue(int frame, CVector3f& valOut) const override; }; class CVEParticleSystemOrientationFront : public CVectorElement { public: - ~CVEParticleSystemOrientationFront() {} - bool GetValue(int frame, CVector3f& valOut) const; + ~CVEParticleSystemOrientationFront() override {} + bool GetValue(int frame, CVector3f& valOut) const override; }; class CVEParticleSystemOrientationUp : public CVectorElement { public: - ~CVEParticleSystemOrientationUp() {} - bool GetValue(int frame, CVector3f& valOut) const; + ~CVEParticleSystemOrientationUp() override {} + bool GetValue(int frame, CVector3f& valOut) const override; }; class CVEParticleSystemOrientationRight : public CVectorElement { public: - ~CVEParticleSystemOrientationRight() {} - bool GetValue(int frame, CVector3f& valOut) const; + ~CVEParticleSystemOrientationRight() override {} + bool GetValue(int frame, CVector3f& valOut) const override; }; class CVEParticleSystemTranslation : public CVectorElement { public: - ~CVEParticleSystemTranslation() {} - bool GetValue(int frame, CVector3f& valOut) const; + ~CVEParticleSystemTranslation() override {} + bool GetValue(int frame, CVector3f& valOut) const override; }; class CVEConstant : public CVectorElement { public: CVEConstant(CRealElement* x, CRealElement* y, CRealElement* z); ~CVEConstant(); - bool GetValue(int frame, CVector3f& valOut) const; + bool GetValue(int frame, CVector3f& valOut) const override; public: CRealElement* x4_x; @@ -82,7 +82,7 @@ class CVECone : public CVectorElement { public: CVECone(CVectorElement* direction, CRealElement* magnitude); ~CVECone(); - bool GetValue(int frame, CVector3f& valOut) const; + bool GetValue(int frame, CVector3f& valOut) const override; }; class CVEAngleCone : public CVectorElement { @@ -96,7 +96,7 @@ public: CVEAngleCone(CRealElement* angleXConstant, CRealElement* angleYConstant, CRealElement* angleXRange, CRealElement* angleYRange, CRealElement* magnitude); ~CVEAngleCone(); - bool GetValue(int frame, CVector3f& valOut) const; + bool GetValue(int frame, CVector3f& valOut) const override; }; #endif // _CVECTORELEMENT diff --git a/include/Kyoto/Particles/IElement.hpp b/include/Kyoto/Particles/IElement.hpp index 46cb47b1..95ddcfa0 100644 --- a/include/Kyoto/Particles/IElement.hpp +++ b/include/Kyoto/Particles/IElement.hpp @@ -27,7 +27,7 @@ public: class CIntElement : public IElement { public: - ~CIntElement() {}; + ~CIntElement() override{}; virtual bool GetValue(int frame, int& valOut) const = 0; }; diff --git a/include/Kyoto/Streams/CMemoryInStream.hpp b/include/Kyoto/Streams/CMemoryInStream.hpp index 48ed9caa..aabdcafb 100644 --- a/include/Kyoto/Streams/CMemoryInStream.hpp +++ b/include/Kyoto/Streams/CMemoryInStream.hpp @@ -12,8 +12,8 @@ public: CMemoryInStream(const void* ptr, unsigned long len); CMemoryInStream(const void* ptr, unsigned long len, EOwnerShip ownership); - virtual ~CMemoryInStream() {} - virtual size_t Read(void* dest, size_t len); + virtual ~CMemoryInStream() override {} + virtual size_t Read(void* dest, size_t len) override; }; #endif // _CMEMORYINSTREAM diff --git a/include/Kyoto/Streams/CZipInputStream.hpp b/include/Kyoto/Streams/CZipInputStream.hpp index dd0b7ba4..416abfdb 100644 --- a/include/Kyoto/Streams/CZipInputStream.hpp +++ b/include/Kyoto/Streams/CZipInputStream.hpp @@ -13,8 +13,8 @@ class CZipInputStream : public CInputStream { public: CZipInputStream(rstl::auto_ptr< CInputStream > in); - ~CZipInputStream(); - size_t Read(void* dest, size_t len); + ~CZipInputStream() override; + size_t Read(void* dest, size_t len) override; private: rstl::single_ptr mCompBuf; diff --git a/include/MetaRender/CCubeRenderer.hpp b/include/MetaRender/CCubeRenderer.hpp index 468c02fa..34b9c5f3 100644 --- a/include/MetaRender/CCubeRenderer.hpp +++ b/include/MetaRender/CCubeRenderer.hpp @@ -22,75 +22,75 @@ class CModel; class CCubeRenderer : public IRenderer, public IWeaponRenderer { public: - ~CCubeRenderer(); + ~CCubeRenderer() override; // TODO types - void AddStaticGeometry(); - void EnablePVS(const CPVSVisSet& set, int areaIdx); - void DisablePVS(); - void RemoveStaticGeometry(); - void DrawUnsortedGeometry(int areaIdx, int mask, int targetMask); - void DrawSortedGeometry(int areaIdx, int mask, int targetMask); - void DrawStaticGeometry(int areaIdx, int mask, int targetMask); - void DrawAreaGeometry(int areaIdx, int mask, int targetMask); - void PostRenderFogs(); - void SetModelMatrix(const CTransform4f& xf); - void AddParticleGen(const CParticleGen& gen); - void AddParticleGen2(); - void AddPlaneObject(); + void AddStaticGeometry() override; + void EnablePVS(const CPVSVisSet& set, int areaIdx) override; + void DisablePVS() override; + void RemoveStaticGeometry() override; + void DrawUnsortedGeometry(int areaIdx, int mask, int targetMask) override; + void DrawSortedGeometry(int areaIdx, int mask, int targetMask) override; + void DrawStaticGeometry(int areaIdx, int mask, int targetMask) override; + void DrawAreaGeometry(int areaIdx, int mask, int targetMask) override; + void PostRenderFogs() override; + void SetModelMatrix(const CTransform4f& xf) override; + void AddParticleGen(const CParticleGen& gen) override; + void AddParticleGen2() override; + void AddPlaneObject() override; void AddDrawable(const void* obj, const CVector3f& pos, const CAABox& bounds, int mode, - IRenderer::EDrawableSorting sorting); - void SetDrawableCallback(TDrawableCallback cb, void* ctx); - void SetWorldViewpoint(); - void SetPerspective1(float, float, float, float, float); - void SetPerspective2(); + IRenderer::EDrawableSorting sorting) override; + void SetDrawableCallback(TDrawableCallback cb, void* ctx) override; + void SetWorldViewpoint() override; + void SetPerspective1(float, float, float, float, float) override; + void SetPerspective2() override; rstl::pair< CVector2f, CVector2f > SetViewportOrtho(bool centered, float znear, - float zfar); - void SetClippingPlanes(const CFrustumPlanes&); - void SetViewport(int left, int right, int width, int height); - void SetDepthReadWrite(bool read, bool update); - void SetBlendMode_AdditiveAlpha(); - void SetBlendMode_AlphaBlended(); - void SetBlendMode_NoColorWrite(); - void SetBlendMode_ColorMultiply(); - void SetBlendMode_InvertDst(); - void SetBlendMode_InvertSrc(); - void SetBlendMode_Replace(); - void SetBlendMode_AdditiveDestColor(); - void SetDebugOption(); - void BeginScene(); - void EndScene(); - void BeginPrimitive(GXPrimitive prim, int count); - void BeginLines(int nverts); - void BeginLineStrip(int nverts); - void BeginTriangles(int nverts); - void BeginTriangleStrip(int nverts); - void BeginTriangleFan(int nverts); - void PrimVertex(const CVector3f& vtx); - void PrimNormal(const CVector3f& nrm); - void PrimColor(float r, float g, float b, float a); - void PrimColor(const CColor& color); - void EndPrimitive(); - void SetAmbientColor(const CColor& color); - void DrawString(); - void GetFPS(); - void CacheReflection(); - void DrawSpaceWarp(); - void DrawThermalModel(); - void DrawModelDisintegrate(); - void DrawModelFlat(); - void SetWireframeFlags(); - void SetWorldFog(); + float zfar) override; + void SetClippingPlanes(const CFrustumPlanes&) override; + void SetViewport(int left, int right, int width, int height) override; + void SetDepthReadWrite(bool read, bool update) override; + void SetBlendMode_AdditiveAlpha() override; + void SetBlendMode_AlphaBlended() override; + void SetBlendMode_NoColorWrite() override; + void SetBlendMode_ColorMultiply() override; + void SetBlendMode_InvertDst() override; + void SetBlendMode_InvertSrc() override; + void SetBlendMode_Replace() override; + void SetBlendMode_AdditiveDestColor() override; + void SetDebugOption() override; + void BeginScene() override; + void EndScene() override; + void BeginPrimitive(GXPrimitive prim, int count) override; + void BeginLines(int nverts) override; + void BeginLineStrip(int nverts) override; + void BeginTriangles(int nverts) override; + void BeginTriangleStrip(int nverts) override; + void BeginTriangleFan(int nverts) override; + void PrimVertex(const CVector3f& vtx) override; + void PrimNormal(const CVector3f& nrm) override; + void PrimColor(float r, float g, float b, float a) override; + void PrimColor(const CColor& color) override; + void EndPrimitive() override; + void SetAmbientColor(const CColor& color) override; + void DrawString() override; + void GetFPS() override; + void CacheReflection() override; + void DrawSpaceWarp() override; + void DrawThermalModel() override; + void DrawModelDisintegrate() override; + void DrawModelFlat() override; + void SetWireframeFlags() override; + void SetWorldFog() override; void RenderFogVolume(const CColor&, const CAABox&, const TLockedToken< CModel >*, - const CSkinnedModel*); - void SetThermal(); - void SetThermalColdScale(); - void DoThermalBlendCold(); - void DoThermalBlendHot(); - void GetStaticWorldDataSize(); - void SetGXRegister1Color(); - void SetWorldLightFadeLevel(); - void Something(); - void PrepareDynamicLights(const rstl::vector& lights); + const CSkinnedModel*) override; + void SetThermal() override; + void SetThermalColdScale() override; + void DoThermalBlendCold() override; + void DoThermalBlendHot() override; + void GetStaticWorldDataSize() override; + void SetGXRegister1Color() override; + void SetWorldLightFadeLevel() override; + void Something() override; + void PrepareDynamicLights(const rstl::vector& lights) override; void AllocatePhazonSuitMaskTexture(); diff --git a/include/MetroidPrime/BodyState/CABSAim.hpp b/include/MetroidPrime/BodyState/CABSAim.hpp index 79c0beb8..d5aa278f 100644 --- a/include/MetroidPrime/BodyState/CABSAim.hpp +++ b/include/MetroidPrime/BodyState/CABSAim.hpp @@ -6,9 +6,9 @@ class CABSAim : public CAdditiveBodyState { public: CABSAim(); - void Start(CBodyController& bc, CStateManager& mgr); - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); - void Shutdown(CBodyController& bc); + void Start(CBodyController& bc, CStateManager& mgr) override; + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; + void Shutdown(CBodyController& bc) override; private: bool x4_needsIdle; diff --git a/include/MetroidPrime/BodyState/CABSFlinch.hpp b/include/MetroidPrime/BodyState/CABSFlinch.hpp index 55b9b07f..a42f363e 100644 --- a/include/MetroidPrime/BodyState/CABSFlinch.hpp +++ b/include/MetroidPrime/BodyState/CABSFlinch.hpp @@ -10,9 +10,9 @@ class CABSFlinch : public CAdditiveBodyState { public: CABSFlinch(); - void Start(CBodyController& bc, CStateManager& mgr); - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); - void Shutdown(CBodyController& bc); + void Start(CBodyController& bc, CStateManager& mgr) override; + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; + void Shutdown(CBodyController& bc) override; ~CABSFlinch(); }; diff --git a/include/MetroidPrime/BodyState/CABSIdle.hpp b/include/MetroidPrime/BodyState/CABSIdle.hpp index fc2f12b0..8054cdc6 100644 --- a/include/MetroidPrime/BodyState/CABSIdle.hpp +++ b/include/MetroidPrime/BodyState/CABSIdle.hpp @@ -7,9 +7,9 @@ class CABSIdle : public CAdditiveBodyState { pas::EAnimationState GetBodyStateTransition(float dt, CBodyController& bc) const; public: - void Start(CBodyController& bc, CStateManager& mgr) {} - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); - void Shutdown(CBodyController& bc) {} + void Start(CBodyController& bc, CStateManager& mgr) override {} + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; + void Shutdown(CBodyController& bc) override {} }; #endif // _CABSIDLE diff --git a/include/MetroidPrime/BodyState/CABSReaction.hpp b/include/MetroidPrime/BodyState/CABSReaction.hpp index e4891637..877a938e 100644 --- a/include/MetroidPrime/BodyState/CABSReaction.hpp +++ b/include/MetroidPrime/BodyState/CABSReaction.hpp @@ -8,9 +8,9 @@ public: CABSReaction(); ~CABSReaction(); - void Start(CBodyController& bc, CStateManager& mgr); - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); - void Shutdown(CBodyController& bc); + void Start(CBodyController& bc, CStateManager& mgr) override; + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; + void Shutdown(CBodyController& bc) override; float GetWeight() const { return x4_weight; } bool IsActive() const { return x10_active; } diff --git a/include/MetroidPrime/BodyState/CBSAttack.hpp b/include/MetroidPrime/BodyState/CBSAttack.hpp index 538033f2..fdadd6b0 100644 --- a/include/MetroidPrime/BodyState/CBSAttack.hpp +++ b/include/MetroidPrime/BodyState/CBSAttack.hpp @@ -11,10 +11,10 @@ class CBSAttack : public CBodyState { public: CBSAttack(); - bool CanShoot() const { return false; } - void Start(CBodyController& bc, CStateManager& mgr); - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); - void Shutdown(CBodyController&); + 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; private: pas::EAnimationState x4_nextState; // = pas::kAS_Invalid; diff --git a/include/MetroidPrime/BodyState/CBSCover.hpp b/include/MetroidPrime/BodyState/CBSCover.hpp index 5ccc578f..9953d01d 100644 --- a/include/MetroidPrime/BodyState/CBSCover.hpp +++ b/include/MetroidPrime/BodyState/CBSCover.hpp @@ -6,12 +6,12 @@ class CBSCover : public CBodyState { public: CBSCover(); - 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&); + 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; pas::ECoverDirection GetCoverDirection() const { return x8_coverDirection; } bool GetNeedsExit() const { return xc_needsExit; } diff --git a/include/MetroidPrime/BodyState/CBSDie.hpp b/include/MetroidPrime/BodyState/CBSDie.hpp index b5a61476..dcf5c03e 100644 --- a/include/MetroidPrime/BodyState/CBSDie.hpp +++ b/include/MetroidPrime/BodyState/CBSDie.hpp @@ -8,11 +8,11 @@ public: CBSDie(); ~CBSDie(); - bool IsDead() const; - bool IsDying() const; - void Start(CBodyController& bc, CStateManager& mgr); - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); - void Shutdown(CBodyController&); + 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; private: float x4_remTime; diff --git a/include/MetroidPrime/BodyState/CBSFall.hpp b/include/MetroidPrime/BodyState/CBSFall.hpp index cc5037f4..a664ecd8 100644 --- a/include/MetroidPrime/BodyState/CBSFall.hpp +++ b/include/MetroidPrime/BodyState/CBSFall.hpp @@ -8,9 +8,9 @@ public: CBSFall(); ~CBSFall(); - void Start(CBodyController& bc, CStateManager& mgr); - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); - void Shutdown(CBodyController& bc); + void Start(CBodyController& bc, CStateManager& mgr) override; + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; + void Shutdown(CBodyController& bc) override; private: float x4_rotateSpeed; diff --git a/include/MetroidPrime/BodyState/CBSGenerate.hpp b/include/MetroidPrime/BodyState/CBSGenerate.hpp index 4607f78e..e993cd08 100644 --- a/include/MetroidPrime/BodyState/CBSGenerate.hpp +++ b/include/MetroidPrime/BodyState/CBSGenerate.hpp @@ -8,9 +8,9 @@ public: CBSGenerate(); ~CBSGenerate(); - void Start(CBodyController& bc, CStateManager& mgr); - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); - void Shutdown(CBodyController&); + void Start(CBodyController& bc, CStateManager& mgr) override; + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; + void Shutdown(CBodyController&) override; private: pas::EAnimationState GetBodyStateTransition(float dt, CBodyController& bc); diff --git a/include/MetroidPrime/BodyState/CBSGetup.hpp b/include/MetroidPrime/BodyState/CBSGetup.hpp index 28f5831b..dfb8c460 100644 --- a/include/MetroidPrime/BodyState/CBSGetup.hpp +++ b/include/MetroidPrime/BodyState/CBSGetup.hpp @@ -8,9 +8,9 @@ public: CBSGetup(); ~CBSGetup(); - void Start(CBodyController& bc, CStateManager& mgr); - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); - void Shutdown(CBodyController& bc); + void Start(CBodyController& bc, CStateManager& mgr) override; + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; + void Shutdown(CBodyController& bc) override; private: pas::EFallState x4_fallState; diff --git a/include/MetroidPrime/BodyState/CBSGroundHit.hpp b/include/MetroidPrime/BodyState/CBSGroundHit.hpp index 4fab2169..d9f44161 100644 --- a/include/MetroidPrime/BodyState/CBSGroundHit.hpp +++ b/include/MetroidPrime/BodyState/CBSGroundHit.hpp @@ -8,9 +8,9 @@ public: CBSGroundHit(); ~CBSGroundHit(); - void Start(CBodyController& bc, CStateManager& mgr); - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); - void Shutdown(CBodyController& bc); + void Start(CBodyController& bc, CStateManager& mgr) override; + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; + void Shutdown(CBodyController& bc) override; private: float x4_rotateSpeed; diff --git a/include/MetroidPrime/BodyState/CBSKnockBack.hpp b/include/MetroidPrime/BodyState/CBSKnockBack.hpp index 5857bfc4..c4e5f045 100644 --- a/include/MetroidPrime/BodyState/CBSKnockBack.hpp +++ b/include/MetroidPrime/BodyState/CBSKnockBack.hpp @@ -8,10 +8,10 @@ public: CBSKnockBack(); ~CBSKnockBack(); - void Start(CBodyController& bc, CStateManager& mgr); - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); - void Shutdown(CBodyController&); - bool IsMoving() const; + 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; private: float x4_curTime; diff --git a/include/MetroidPrime/BodyState/CBSLieOnGround.hpp b/include/MetroidPrime/BodyState/CBSLieOnGround.hpp index 2af9b064..0172205e 100644 --- a/include/MetroidPrime/BodyState/CBSLieOnGround.hpp +++ b/include/MetroidPrime/BodyState/CBSLieOnGround.hpp @@ -10,9 +10,9 @@ public: explicit CBSLieOnGround(const CActor& actor); ~CBSLieOnGround(); - void Start(CBodyController& bc, CStateManager& mgr); - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); - void Shutdown(CBodyController& bc); + void Start(CBodyController& bc, CStateManager& mgr) override; + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; + void Shutdown(CBodyController& bc) override; private: uint x4_24_hasGroundHit : 1; diff --git a/include/MetroidPrime/BodyState/CBSLocomotion.hpp b/include/MetroidPrime/BodyState/CBSLocomotion.hpp index e3c441fb..b81a73a6 100644 --- a/include/MetroidPrime/BodyState/CBSLocomotion.hpp +++ b/include/MetroidPrime/BodyState/CBSLocomotion.hpp @@ -14,10 +14,10 @@ protected: public: bool IsMoving() const override = 0; - bool CanShoot() const { return true; } - void Start(CBodyController& bc, CStateManager& mgr); - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); - void Shutdown(CBodyController& bc); + 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; virtual bool IsPitchable() const { return false; } virtual float GetLocomotionSpeed(pas::ELocomotionType type, pas::ELocomotionAnim anim) const = 0; virtual float ApplyLocomotionPhysics(float dt, CBodyController& bc); diff --git a/include/MetroidPrime/BodyState/CBSLoopAttack.hpp b/include/MetroidPrime/BodyState/CBSLoopAttack.hpp index b28eb070..b862a6c0 100644 --- a/include/MetroidPrime/BodyState/CBSLoopAttack.hpp +++ b/include/MetroidPrime/BodyState/CBSLoopAttack.hpp @@ -7,10 +7,10 @@ class CBSLoopAttack : public CBodyState { public: CBSLoopAttack(); - bool CanShoot() const { return true; } - void Start(CBodyController& bc, CStateManager& mgr); - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); - void Shutdown(CBodyController&); + 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; pas::ELoopState GetState() const { return x4_state; } pas::ELoopAttackType GetAttackType() const { return x8_loopAttackType; } diff --git a/include/MetroidPrime/BodyState/CBSLoopReaction.hpp b/include/MetroidPrime/BodyState/CBSLoopReaction.hpp index 53d3f96b..20105e65 100644 --- a/include/MetroidPrime/BodyState/CBSLoopReaction.hpp +++ b/include/MetroidPrime/BodyState/CBSLoopReaction.hpp @@ -7,9 +7,9 @@ class CBSLoopReaction : public CBodyState { public: CBSLoopReaction(); - void Start(CBodyController& bc, CStateManager& mgr); - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); - void Shutdown(CBodyController&) {} + void Start(CBodyController& bc, CStateManager& mgr) override; + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; + void Shutdown(CBodyController&) override {} private: pas::ELoopState x4_state; diff --git a/include/MetroidPrime/BodyState/CBSProjectileAttack.hpp b/include/MetroidPrime/BodyState/CBSProjectileAttack.hpp index 64fa3867..6c9d85a4 100644 --- a/include/MetroidPrime/BodyState/CBSProjectileAttack.hpp +++ b/include/MetroidPrime/BodyState/CBSProjectileAttack.hpp @@ -8,10 +8,10 @@ public: CBSProjectileAttack(); ~CBSProjectileAttack(); - bool CanShoot() const; - void Start(CBodyController& bc, CStateManager& mgr); - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); - void Shutdown(CBodyController&); + 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; private: pas::EAnimationState GetBodyStateTransition(float dt, CBodyController& bc); diff --git a/include/MetroidPrime/BodyState/CBSScripted.hpp b/include/MetroidPrime/BodyState/CBSScripted.hpp index 78f51f50..1e9d2227 100644 --- a/include/MetroidPrime/BodyState/CBSScripted.hpp +++ b/include/MetroidPrime/BodyState/CBSScripted.hpp @@ -8,10 +8,10 @@ public: CBSScripted(); ~CBSScripted(); - bool ApplyHeadTracking() const; - void Start(CBodyController& bc, CStateManager& mgr); - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); - void Shutdown(CBodyController&); + 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; private: bool x4_24_loopAnim : 1; diff --git a/include/MetroidPrime/BodyState/CBSSlide.hpp b/include/MetroidPrime/BodyState/CBSSlide.hpp index 73908c9b..f5c32a73 100644 --- a/include/MetroidPrime/BodyState/CBSSlide.hpp +++ b/include/MetroidPrime/BodyState/CBSSlide.hpp @@ -10,11 +10,11 @@ public: CBSSlide(); ~CBSSlide(); - bool ApplyHeadTracking() const; - bool IsMoving() const; - void Start(CBodyController& bc, CStateManager& mgr); - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); - void Shutdown(CBodyController&); + 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; private: float x4_rotateSpeed; diff --git a/include/MetroidPrime/BodyState/CBSStep.hpp b/include/MetroidPrime/BodyState/CBSStep.hpp index 5436a099..558e26ff 100644 --- a/include/MetroidPrime/BodyState/CBSStep.hpp +++ b/include/MetroidPrime/BodyState/CBSStep.hpp @@ -8,11 +8,11 @@ public: CBSStep(); ~CBSStep(); - void Start(CBodyController& bc, CStateManager& mgr); - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); - void Shutdown(CBodyController&); - bool IsMoving() const; - bool CanShoot() const; + 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; private: pas::EAnimationState GetBodyStateTransition(float dt, CBodyController& bc); diff --git a/include/MetroidPrime/BodyState/CBSTaunt.hpp b/include/MetroidPrime/BodyState/CBSTaunt.hpp index f046656a..5ddef1d2 100644 --- a/include/MetroidPrime/BodyState/CBSTaunt.hpp +++ b/include/MetroidPrime/BodyState/CBSTaunt.hpp @@ -8,9 +8,9 @@ public: CBSTaunt(); ~CBSTaunt(); - void Start(CBodyController& bc, CStateManager& mgr); - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); - void Shutdown(CBodyController&); + void Start(CBodyController& bc, CStateManager& mgr) override; + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; + void Shutdown(CBodyController&) override; private: pas::EAnimationState GetBodyStateTransition(float dt, CBodyController& bc); diff --git a/include/MetroidPrime/BodyState/CBSTurn.hpp b/include/MetroidPrime/BodyState/CBSTurn.hpp index c2df1e5c..39576570 100644 --- a/include/MetroidPrime/BodyState/CBSTurn.hpp +++ b/include/MetroidPrime/BodyState/CBSTurn.hpp @@ -8,12 +8,12 @@ class CBSTurn : public CBodyState { public: CBSTurn(); - ~CBSTurn() {} + ~CBSTurn() override {} - bool CanShoot() const { return true; } - void Start(CBodyController& bc, CStateManager& mgr); - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); - void Shutdown(CBodyController&); + 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; protected: float x4_rotateSpeed; @@ -28,8 +28,8 @@ protected: class CBSFlyerTurn : public CBSTurn { public: CBSFlyerTurn(); - void Start(CBodyController& bc, CStateManager& mgr); - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); + void Start(CBodyController& bc, CStateManager& mgr) override; + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; }; #endif // _CBSTURN diff --git a/include/MetroidPrime/BodyState/CBodyStateCmdMgr.hpp b/include/MetroidPrime/BodyState/CBodyStateCmdMgr.hpp index 10fd85c9..c69e4ab3 100644 --- a/include/MetroidPrime/BodyState/CBodyStateCmdMgr.hpp +++ b/include/MetroidPrime/BodyState/CBodyStateCmdMgr.hpp @@ -156,7 +156,7 @@ public: CBCSlideCmd(pas::ESlideType type, const CVector3f& dir) : CBodyStateCmd(kBSC_Slide), x8_type(type), xc_dir(dir) {} - ~CBCSlideCmd() {} + ~CBCSlideCmd() override {} pas::ESlideType GetSlideType() const { return x8_type; } const CVector3f& GetSlideDirection() const { return xc_dir; } diff --git a/include/MetroidPrime/CActor.hpp b/include/MetroidPrime/CActor.hpp index bcd4910e..5bd4bffd 100644 --- a/include/MetroidPrime/CActor.hpp +++ b/include/MetroidPrime/CActor.hpp @@ -56,7 +56,7 @@ 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(); + ~CActor() override; void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); void SetActive(const bool active); diff --git a/include/MetroidPrime/CAnimationDatabaseGame.hpp b/include/MetroidPrime/CAnimationDatabaseGame.hpp index 43ec4ab9..7c3e5b02 100644 --- a/include/MetroidPrime/CAnimationDatabaseGame.hpp +++ b/include/MetroidPrime/CAnimationDatabaseGame.hpp @@ -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; - uint GetNumMetaAnims() const; - rstl::string GetMetaAnimName(uint idx) const; - void GetAllUniquePrimitives(rstl::vector< CPrimitive >& primsOut) const; + 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; void GetUniquePrimitivesFromMetaAnim(rstl::set< CPrimitive >& primsOut, - const rstl::string& name) const; + const rstl::string& name) const override; private: rstl::vector< rstl::rc_ptr< IMetaAnim > > x10_anims; diff --git a/include/MetroidPrime/CAudioStateWin.hpp b/include/MetroidPrime/CAudioStateWin.hpp index ac8c8a3e..15163049 100644 --- a/include/MetroidPrime/CAudioStateWin.hpp +++ b/include/MetroidPrime/CAudioStateWin.hpp @@ -9,8 +9,8 @@ class CAudioStateWin : public CIOWin { public: CAudioStateWin(); - ~CAudioStateWin(); - EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&); + ~CAudioStateWin() override; + EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override; }; #endif // _CAUDIOSTATEWIN diff --git a/include/MetroidPrime/CCollisionActor.hpp b/include/MetroidPrime/CCollisionActor.hpp index 5c9a4304..c212c14f 100644 --- a/include/MetroidPrime/CCollisionActor.hpp +++ b/include/MetroidPrime/CCollisionActor.hpp @@ -30,26 +30,26 @@ public: float mass); // CEntity - ~CCollisionActor(); - void Accept(IVisitor& visitor); - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); + ~CCollisionActor() override; + void Accept(IVisitor& visitor) override; + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; // CActor - CHealthInfo* HealthInfo(CStateManager&); - const CDamageVulnerability* GetDamageVulnerability() const; + CHealthInfo* HealthInfo(CStateManager&) override; + const CDamageVulnerability* GetDamageVulnerability() const override; const CDamageVulnerability* GetDamageVulnerability(const CVector3f&, const CVector3f&, - const CDamageInfo&) const; - rstl::optional_object< CAABox > GetTouchBounds() const; - void Touch(CActor&, CStateManager&); - CVector3f GetOrbitPosition(const CStateManager&) const; - CVector3f GetScanObjectIndicatorPosition(const CStateManager&) const; + 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; EWeaponCollisionResponseTypes GetCollisionResponseType(const CVector3f&, const CVector3f&, const CWeaponMode&, - int /*EProjectileAttrib?*/) const; - void OnScanStateChange(EScanState, CStateManager&); + int /*EProjectileAttrib?*/) const override; + void OnScanStateChange(EScanState, CStateManager&) override; // CPhysicsActor - CTransform4f GetPrimitiveTransform() const; + CTransform4f GetPrimitiveTransform() const override; private: EPrimitiveType x258_primitiveType; diff --git a/include/MetroidPrime/CConsoleOutputWindow.hpp b/include/MetroidPrime/CConsoleOutputWindow.hpp index fb92bf89..6ff090fb 100644 --- a/include/MetroidPrime/CConsoleOutputWindow.hpp +++ b/include/MetroidPrime/CConsoleOutputWindow.hpp @@ -12,8 +12,8 @@ class CConsoleOutputWindow : public CIOWin { public: CConsoleOutputWindow(int, float, float); - ~CConsoleOutputWindow(); - EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&); + ~CConsoleOutputWindow() override; + EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override; void Update(float); void Draw() const; private: diff --git a/include/MetroidPrime/CCredits.hpp b/include/MetroidPrime/CCredits.hpp index 3c16c97f..98395284 100644 --- a/include/MetroidPrime/CCredits.hpp +++ b/include/MetroidPrime/CCredits.hpp @@ -19,11 +19,11 @@ class CVector3f; class CCredits : public CIOWin { public: CCredits(); - ~CCredits(); + ~CCredits() override; - EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&); - bool GetIsContinueDraw() const; - void Draw() const; + EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override; + bool GetIsContinueDraw() const override; + void Draw() const override; EMessageReturn Update(float, CArchitectureQueue& queue); EMessageReturn ProcessUserInput(const CFinalInput& input); diff --git a/include/MetroidPrime/CEffect.hpp b/include/MetroidPrime/CEffect.hpp index 4d3f3409..225f1610 100644 --- a/include/MetroidPrime/CEffect.hpp +++ b/include/MetroidPrime/CEffect.hpp @@ -11,11 +11,11 @@ public: const CTransform4f& xf); // CEntity - ~CEffect() {} + ~CEffect() 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; }; CHECK_SIZEOF(CEffect, 0xe8) diff --git a/include/MetroidPrime/CErrorOutputWindow.hpp b/include/MetroidPrime/CErrorOutputWindow.hpp index 6a69082c..9fb6863e 100644 --- a/include/MetroidPrime/CErrorOutputWindow.hpp +++ b/include/MetroidPrime/CErrorOutputWindow.hpp @@ -8,11 +8,11 @@ class CErrorOutputWindow : public CIOWin { public: CErrorOutputWindow(bool); - ~CErrorOutputWindow(); + ~CErrorOutputWindow() override; - EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&); - bool GetIsContinueDraw() const; - void Draw() const; + EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override; + bool GetIsContinueDraw() const override; + void Draw() const override; void UpdateWindow(); diff --git a/include/MetroidPrime/CExplosion.hpp b/include/MetroidPrime/CExplosion.hpp index f0f81146..d3eb7bf7 100644 --- a/include/MetroidPrime/CExplosion.hpp +++ b/include/MetroidPrime/CExplosion.hpp @@ -22,16 +22,16 @@ public: const CVector3f& scale, const CColor& color); // CEntity - ~CExplosion(); - void Accept(IVisitor& visitor); - void Think(float dt, CStateManager& mgr); - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); + ~CExplosion() 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&); - void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const; - void Render(const CStateManager&) const; - void CalculateRenderBounds(); + void PreRender(CStateManager&, const CFrustumPlanes&) override; + void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override; + void Render(const CStateManager&) const override; + void CalculateRenderBounds() override; public: rstl::single_ptr< CParticleGen > xe8_particleGen; diff --git a/include/MetroidPrime/CFlameWarp.hpp b/include/MetroidPrime/CFlameWarp.hpp index dec8d100..f97f2636 100644 --- a/include/MetroidPrime/CFlameWarp.hpp +++ b/include/MetroidPrime/CFlameWarp.hpp @@ -14,7 +14,7 @@ class CColor; class CFlameWarp : public CWarp { public: CFlameWarp(float maxInfluenceDist, const CVector3f& warpPoint, bool collisionWarp); - ~CFlameWarp(); + ~CFlameWarp() override; 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(); + bool UpdateWarp() override; void ModifyParticles(int particleCount, int stripe, int*, CVector3f* particlePos, CVector3f* particlePrevPos, CVector3f* particleVelocity, - CColor* color, float* lineLengthOrSize, float* lineWidthOrRota); - void Activate(bool val) { xa0_24_activated = val; } - bool IsActivated(); + CColor* color, float* lineLengthOrSize, float* lineWidthOrRota) override; + void Activate(bool val) override { xa0_24_activated = val; } + bool IsActivated() override; bool IsProcessed() const { return xa0_26_processed; } - FourCC Get4CharID(); + FourCC Get4CharID() override; void ResetPosition(const CVector3f& pos); CAABox CalculateBounds() const; diff --git a/include/MetroidPrime/CGameArea.hpp b/include/MetroidPrime/CGameArea.hpp index 889f4659..07f45d5b 100644 --- a/include/MetroidPrime/CGameArea.hpp +++ b/include/MetroidPrime/CGameArea.hpp @@ -94,14 +94,14 @@ public: }; ~CGameArea(); - 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; + 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; TAreaId GetId() const { return x4_selfIdx; } const CTransform4f& GetTM() const { return xc_transform; } diff --git a/include/MetroidPrime/CGameLight.hpp b/include/MetroidPrime/CGameLight.hpp index 30f34e05..e0444be4 100644 --- a/include/MetroidPrime/CGameLight.hpp +++ b/include/MetroidPrime/CGameLight.hpp @@ -14,8 +14,8 @@ public: void SetLight(const CLight& light); CLight GetLight() const; - void Think(float dt, CStateManager& mgr); - void Accept(IVisitor& visitor); + void Think(float dt, CStateManager& mgr) override; + void Accept(IVisitor& visitor) override; void SetLightPriorityAndId(); private: diff --git a/include/MetroidPrime/CMainFlow.hpp b/include/MetroidPrime/CMainFlow.hpp index 8b3cd330..8d98bd9f 100644 --- a/include/MetroidPrime/CMainFlow.hpp +++ b/include/MetroidPrime/CMainFlow.hpp @@ -24,10 +24,10 @@ class CMainFlow : public CIOWin { public: CMainFlow(); - ~CMainFlow(); - EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&); - bool GetIsContinueDraw() const; - void Draw() const; + ~CMainFlow() override; + EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override; + bool GetIsContinueDraw() const override; + void Draw() const override; void AdvanceGameState(CArchitectureQueue& queue); void SetGameState(EClientFlowStates state, CArchitectureQueue& queue); diff --git a/include/MetroidPrime/CParticleGenInfoGeneric.hpp b/include/MetroidPrime/CParticleGenInfoGeneric.hpp index 80eb6842..c1d9cb44 100644 --- a/include/MetroidPrime/CParticleGenInfoGeneric.hpp +++ b/include/MetroidPrime/CParticleGenInfoGeneric.hpp @@ -14,23 +14,23 @@ public: EParticleGenType state); ~CParticleGenInfoGeneric(); - 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 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); + 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 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; const rstl::rc_ptr< CParticleGen >& GetParticleSystem() const { return x84_system; } diff --git a/include/MetroidPrime/CPhysicsActor.hpp b/include/MetroidPrime/CPhysicsActor.hpp index bbde1e7a..9f24fe2e 100644 --- a/include/MetroidPrime/CPhysicsActor.hpp +++ b/include/MetroidPrime/CPhysicsActor.hpp @@ -68,10 +68,10 @@ public: float stepUp, float stepDown); // CActor - ~CPhysicsActor(); - void Render(const CStateManager&) const; - CVector3f GetOrbitPosition(const CStateManager& mgr) const; - CVector3f GetAimPosition(const CStateManager& mgr, float val) const; + ~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 virtual const CCollisionPrimitive* GetCollisionPrimitive() const; diff --git a/include/MetroidPrime/CSplashScreen.hpp b/include/MetroidPrime/CSplashScreen.hpp index f8f629fb..62f0fbb3 100644 --- a/include/MetroidPrime/CSplashScreen.hpp +++ b/include/MetroidPrime/CSplashScreen.hpp @@ -15,9 +15,9 @@ public: CSplashScreen(ESplashScreen); - ~CSplashScreen(); - EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&); - void Draw() const; + ~CSplashScreen() override; + EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override; + void Draw() const override; }; #endif // _CSPLASHSCREEN diff --git a/include/MetroidPrime/CWorld.hpp b/include/MetroidPrime/CWorld.hpp index 949f8035..5a9acdf6 100644 --- a/include/MetroidPrime/CWorld.hpp +++ b/include/MetroidPrime/CWorld.hpp @@ -64,17 +64,17 @@ enum EEnvFxType { class CWorld : public IWorld { public: ~CWorld(); - 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; + 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; void SetLoadPauseState(bool); void TouchSky() const; diff --git a/include/MetroidPrime/Cameras/CBallCamera.hpp b/include/MetroidPrime/Cameras/CBallCamera.hpp index 5e35e2a3..a9f48f4b 100644 --- a/include/MetroidPrime/Cameras/CBallCamera.hpp +++ b/include/MetroidPrime/Cameras/CBallCamera.hpp @@ -99,17 +99,17 @@ public: float farZ, float aspect); // CEntity - ~CBallCamera(); - void Accept(IVisitor& visitor); - void Think(float dt, CStateManager& mgr); - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); + ~CBallCamera() 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; + void Render(const CStateManager&) const override; // CGameCamera - void ProcessInput(const CFinalInput&, CStateManager& mgr); - void Reset(const CTransform4f&, CStateManager& mgr); + void ProcessInput(const CFinalInput&, CStateManager& mgr) override; + void Reset(const CTransform4f&, CStateManager& mgr) override; // CBallCamera void SetupColliders(rstl::vector< CCameraCollider >& out, float xMag, float zMag, float radius, diff --git a/include/MetroidPrime/Cameras/CCinematicCamera.hpp b/include/MetroidPrime/Cameras/CCinematicCamera.hpp index 16c0bb1a..ae67f13b 100644 --- a/include/MetroidPrime/Cameras/CCinematicCamera.hpp +++ b/include/MetroidPrime/Cameras/CCinematicCamera.hpp @@ -12,14 +12,14 @@ public: float zfar, float aspect, uint flags); ~CCinematicCamera(); // CActor - void Accept(IVisitor& visitor); - void Think(float dt, CStateManager& mgr); - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); + void Accept(IVisitor& visitor) override; + void Think(float dt, CStateManager& mgr) override; + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; // CGameCamera - void ProcessInput(const CFinalInput&, CStateManager& mgr); - void Reset(const CTransform4f&, CStateManager& mgr); + void ProcessInput(const CFinalInput&, CStateManager& mgr) override; + void Reset(const CTransform4f&, CStateManager& mgr) override; // CCinematicCamera u32 GetFlags() const { return x21c_flags; } diff --git a/include/MetroidPrime/Cameras/CGameCamera.hpp b/include/MetroidPrime/Cameras/CGameCamera.hpp index 7428bb07..b7c9168a 100644 --- a/include/MetroidPrime/Cameras/CGameCamera.hpp +++ b/include/MetroidPrime/Cameras/CGameCamera.hpp @@ -17,10 +17,10 @@ public: TUniqueId watchedId, bool disableInput, int controllerIdx); // CEntity - ~CGameCamera(); - void Accept(IVisitor& visitor); - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); - void SetActive(const bool active); + ~CGameCamera() override; + void Accept(IVisitor& visitor) override; + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; + void SetActive(uchar active) override; // CGameCamera virtual void ProcessInput(const CFinalInput&, CStateManager& mgr) = 0; diff --git a/include/MetroidPrime/Cameras/CInterpolationCamera.hpp b/include/MetroidPrime/Cameras/CInterpolationCamera.hpp index be7df89a..9d24353d 100644 --- a/include/MetroidPrime/Cameras/CInterpolationCamera.hpp +++ b/include/MetroidPrime/Cameras/CInterpolationCamera.hpp @@ -7,8 +7,8 @@ class CInterpolationCamera : public CGameCamera { public: CInterpolationCamera(TUniqueId uid, const CTransform4f& xf); // CGameCamera - void ProcessInput(const CFinalInput&, CStateManager& mgr); - void Reset(const CTransform4f&, CStateManager& mgr); + void ProcessInput(const CFinalInput&, CStateManager& mgr) override; + void Reset(const CTransform4f&, CStateManager& mgr) override; private: TUniqueId x188_targetId; float x18c_time; diff --git a/include/MetroidPrime/Enemies/CAi.hpp b/include/MetroidPrime/Enemies/CAi.hpp index 2294819d..044df876 100644 --- a/include/MetroidPrime/Enemies/CAi.hpp +++ b/include/MetroidPrime/Enemies/CAi.hpp @@ -20,13 +20,13 @@ public: // const CStateMachine* GetStateMachine() const; ~CAi(); - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); - CHealthInfo* HealthInfo(CStateManager&); - const CDamageVulnerability* GetDamageVulnerability() const { return nullptr; } + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; + CHealthInfo* HealthInfo(CStateManager&) override; + const CDamageVulnerability* GetDamageVulnerability() const override { return nullptr; } EWeaponCollisionResponseTypes GetCollisionResponseType(const CVector3f&, const CVector3f&, const CWeaponMode&, - int) const; - void FluidFXThink(EFluidState, CScriptWater&, CStateManager&); + int) const override; + void FluidFXThink(EFluidState, CScriptWater&, CStateManager&) override; ; virtual void Death(CStateManager& mgr, const CVector3f& direction, EScriptObjectState state) = 0; diff --git a/include/MetroidPrime/Enemies/CFlaahgraPlants.hpp b/include/MetroidPrime/Enemies/CFlaahgraPlants.hpp index 0babea94..64b1091e 100644 --- a/include/MetroidPrime/Enemies/CFlaahgraPlants.hpp +++ b/include/MetroidPrime/Enemies/CFlaahgraPlants.hpp @@ -16,15 +16,15 @@ public: TUniqueId, const CTransform4f&, const CDamageInfo&, const CVector3f&); // CEntity - ~CFlaahgraPlants(); - void Accept(IVisitor& visitor); - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CStateManager& mgr); - void Think(float dt, CStateManager& mgr); + ~CFlaahgraPlants() override; + void Accept(IVisitor& visitor) override; + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CStateManager& mgr) override; + void Think(float dt, CStateManager& mgr) override; // CActor - void AddToRenderer(const CFrustumPlanes& frustum, const CStateManager& mgr) const; - rstl::optional_object< CAABox > GetTouchBounds() const; - void Touch(CActor& actor, CStateManager& mgr); + void AddToRenderer(const CFrustumPlanes& frustum, const CStateManager& mgr) const override; + rstl::optional_object< CAABox > GetTouchBounds() const override; + void Touch(CActor& actor, CStateManager& mgr) override; private: rstl::auto_ptr< CElementGen > xe8_elementGen; diff --git a/include/MetroidPrime/Enemies/CMetaree.hpp b/include/MetroidPrime/Enemies/CMetaree.hpp index b1e9ce8e..7ac46d41 100644 --- a/include/MetroidPrime/Enemies/CMetaree.hpp +++ b/include/MetroidPrime/Enemies/CMetaree.hpp @@ -17,31 +17,31 @@ public: float f3, float f4, const CActorParameters& aParms); // CEntity - void Accept(IVisitor& visitor); - void Think(float dt, CStateManager& mgr); - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); + void Accept(IVisitor& visitor) override; + void Think(float dt, CStateManager& mgr) override; + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; // CActor - void Touch(CActor&, CStateManager&); + void Touch(CActor&, CStateManager&) override; // CPhysicsActor void CollidedWith(const TUniqueId& id, const CCollisionInfoList& list, - CStateManager& mgr); + CStateManager& mgr) override; // CAi - 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); + 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; // CPatterned - void ThinkAboutMove(float); + void ThinkAboutMove(float) override; private: float x568_delay; diff --git a/include/MetroidPrime/Enemies/CMetroidPrimeProjectile.hpp b/include/MetroidPrime/Enemies/CMetroidPrimeProjectile.hpp index 276cbe57..2c764454 100644 --- a/include/MetroidPrime/Enemies/CMetroidPrimeProjectile.hpp +++ b/include/MetroidPrime/Enemies/CMetroidPrimeProjectile.hpp @@ -42,12 +42,12 @@ public: bool sendCollideMsg); // CEntity - ~CMetroidPrimeProjectile(); - void Accept(IVisitor& visitor); + ~CMetroidPrimeProjectile() override; + void Accept(IVisitor& visitor) override; // CEnergyProjectile bool Explode(const CVector3f& pos, const CVector3f& normal, EWeaponCollisionResponseTypes type, - CStateManager& mgr, const CDamageVulnerability& dVuln, TUniqueId hitActor); + CStateManager& mgr, const CDamageVulnerability& dVuln, TUniqueId hitActor) override; }; #endif // _CMETROIDPRIMEPROJECTILE diff --git a/include/MetroidPrime/Enemies/CNewIntroBoss.hpp b/include/MetroidPrime/Enemies/CNewIntroBoss.hpp index 5fc743bb..b39774ef 100644 --- a/include/MetroidPrime/Enemies/CNewIntroBoss.hpp +++ b/include/MetroidPrime/Enemies/CNewIntroBoss.hpp @@ -19,30 +19,30 @@ public: CAssetId beamTextureId, CAssetId beamGlowTextureId); // CEntity - void Accept(IVisitor& visitor); - void Think(float dt, CStateManager& mgr); - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); + void Accept(IVisitor& visitor) override; + void Think(float dt, CStateManager& mgr) override; + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; // CActor - void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const; - rstl::optional_object< CAABox > GetTouchBounds() const; - void OnScanStateChange(EScanState, CStateManager&); - CAABox GetSortingBounds(const CStateManager&) const; + 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 DoUserAnimEvent(CStateManager& mgr, const CInt32POINode& node, EUserEventType type, - float dt); + float dt) override; // CAi - 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); + 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; // CPatterned - CProjectileInfo* ProjectileInfo(); + CProjectileInfo* ProjectileInfo() override; pas::ELocomotionType GetLocoForHealth(const CStateManager& mgr) const; pas::EGenerateType GetGenerateForHealth(const CStateManager& mgr) const; diff --git a/include/MetroidPrime/Enemies/CPatterned.hpp b/include/MetroidPrime/Enemies/CPatterned.hpp index b75d4b06..ab406a6f 100644 --- a/include/MetroidPrime/Enemies/CPatterned.hpp +++ b/include/MetroidPrime/Enemies/CPatterned.hpp @@ -151,73 +151,73 @@ public: EBodyType body, const CActorParameters& params, EKnockBackVariant kbVariant); // CEntity - ~CPatterned(); - void Accept(IVisitor& visitor); - void PreThink(float dt, CStateManager& mgr); - void Think(float dt, CStateManager& mgr); - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); + ~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; // CActor - 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; + 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; EWeaponCollisionResponseTypes GetCollisionResponseType(const CVector3f&, const CVector3f&, const CWeaponMode&, - int /*EProjectileAttrib?*/) const; + int /*EProjectileAttrib?*/) const override; void DoUserAnimEvent(CStateManager& mgr, const CInt32POINode& node, EUserEventType type, - float dt); + float dt) override; // CPhysicsActor void CollidedWith(const TUniqueId& id, const CCollisionInfoList& list, - CStateManager& mgr); + CStateManager& mgr) override; // CAi - void Death(CStateManager& mgr, const CVector3f& direction, EScriptObjectState state); + void Death(CStateManager& mgr, const CVector3f& direction, EScriptObjectState state) override; void KnockBack(const CVector3f&, CStateManager&, const CDamageInfo& info, EKnockBackType type, - 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); + 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; // CPatterned virtual void Freeze(CStateManager& mgr, const CVector3f& pos, const CUnitVector3f& dir, diff --git a/include/MetroidPrime/Enemies/CPuffer.hpp b/include/MetroidPrime/Enemies/CPuffer.hpp index af6a88ee..d8c1585a 100644 --- a/include/MetroidPrime/Enemies/CPuffer.hpp +++ b/include/MetroidPrime/Enemies/CPuffer.hpp @@ -17,13 +17,13 @@ public: const CDamageInfo& cloudDamage, CAssetId cloudSteam, float f2, bool b1, bool b2, bool b3, const CDamageInfo& explosionDamage, ushort sfxId); - ~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); + ~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; private: CVector3f x568_face; diff --git a/include/MetroidPrime/Enemies/CRipperControlledPlatform.hpp b/include/MetroidPrime/Enemies/CRipperControlledPlatform.hpp index 64b2bf28..8f05e978 100644 --- a/include/MetroidPrime/Enemies/CRipperControlledPlatform.hpp +++ b/include/MetroidPrime/Enemies/CRipperControlledPlatform.hpp @@ -11,7 +11,7 @@ public: const CAABox&, bool, const rstl::optional_object< TLockedToken< CCollidableOBBTreeGroupContainer > >&); ~CRipperControlledPlatform(); - CQuaternion Move(float, CStateManager&); + CQuaternion Move(float, CStateManager&) override; private: TUniqueId x358_owner; diff --git a/include/MetroidPrime/GameObjectLists.hpp b/include/MetroidPrime/GameObjectLists.hpp index 10e9db9a..2bf17aba 100644 --- a/include/MetroidPrime/GameObjectLists.hpp +++ b/include/MetroidPrime/GameObjectLists.hpp @@ -6,37 +6,37 @@ class CActorList : public CObjectList { public: CActorList(); - uchar IsQualified(const CEntity& ent); + uchar IsQualified(const CEntity& ent) override; }; class CPhysicsActorList : public CObjectList { public: CPhysicsActorList(); - uchar IsQualified(const CEntity& ent); + uchar IsQualified(const CEntity& ent) override; }; class CGameCameraList : public CObjectList { public: CGameCameraList(); - uchar IsQualified(const CEntity& ent); + uchar IsQualified(const CEntity& ent) override; }; class CListeningAiList : public CObjectList { public: CListeningAiList(); - uchar IsQualified(const CEntity& ent); + uchar IsQualified(const CEntity& ent) override; }; class CAiWaypointList : public CObjectList { public: CAiWaypointList(); - uchar IsQualified(const CEntity& ent); + uchar IsQualified(const CEntity& ent) override; }; class CPlatformAndDoorList : public CObjectList { public: CPlatformAndDoorList(); - uchar IsQualified(const CEntity& ent); + uchar IsQualified(const CEntity& ent) override; 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); + uchar IsQualified(const CEntity& ent) override; }; diff --git a/include/MetroidPrime/Player/CPlayer.hpp b/include/MetroidPrime/Player/CPlayer.hpp index bdad9e84..0966a3df 100644 --- a/include/MetroidPrime/Player/CPlayer.hpp +++ b/include/MetroidPrime/Player/CPlayer.hpp @@ -143,36 +143,36 @@ public: }; // CEntity - ~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); + ~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; // CActor - 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; + 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; const CDamageVulnerability* GetDamageVulnerability(const CVector3f&, const CVector3f&, - 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&); + 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; // CPhysicsActor - const CCollisionPrimitive* GetCollisionPrimitive() const; - CTransform4f GetPrimitiveTransform() const; + const CCollisionPrimitive* GetCollisionPrimitive() const override; + CTransform4f GetPrimitiveTransform() const override; void CollidedWith(const TUniqueId& id, const CCollisionInfoList& list, - CStateManager& mgr); - float GetStepDownHeight() const; - float GetStepUpHeight() const; - float GetWeight() const; + CStateManager& mgr) override; + float GetStepDownHeight() const override; + float GetStepUpHeight() const override; + float GetWeight() const override; // CPlayer virtual bool IsTransparent(); diff --git a/include/MetroidPrime/ScriptObjects/CFire.hpp b/include/MetroidPrime/ScriptObjects/CFire.hpp index d63ac7bf..f33d511c 100644 --- a/include/MetroidPrime/ScriptObjects/CFire.hpp +++ b/include/MetroidPrime/ScriptObjects/CFire.hpp @@ -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_; diff --git a/include/MetroidPrime/ScriptObjects/CHUDBillboardEffect.hpp b/include/MetroidPrime/ScriptObjects/CHUDBillboardEffect.hpp index af8347cf..a7c52b63 100644 --- a/include/MetroidPrime/ScriptObjects/CHUDBillboardEffect.hpp +++ b/include/MetroidPrime/ScriptObjects/CHUDBillboardEffect.hpp @@ -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(); } diff --git a/include/MetroidPrime/ScriptObjects/CRepulsor.hpp b/include/MetroidPrime/ScriptObjects/CRepulsor.hpp index 501756f4..bcb8d478 100644 --- a/include/MetroidPrime/ScriptObjects/CRepulsor.hpp +++ b/include/MetroidPrime/ScriptObjects/CRepulsor.hpp @@ -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; } }; diff --git a/include/MetroidPrime/ScriptObjects/CScriptActor.hpp b/include/MetroidPrime/ScriptObjects/CScriptActor.hpp index 2ca8f3f4..82229e98 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptActor.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptActor.hpp @@ -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; } diff --git a/include/MetroidPrime/ScriptObjects/CScriptActorKeyframe.hpp b/include/MetroidPrime/ScriptObjects/CScriptActorKeyframe.hpp index b292413a..efc013f2 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptActorKeyframe.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptActorKeyframe.hpp @@ -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; } diff --git a/include/MetroidPrime/ScriptObjects/CScriptActorRotate.hpp b/include/MetroidPrime/ScriptObjects/CScriptActorRotate.hpp index 787d6061..11570e41 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptActorRotate.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptActorRotate.hpp @@ -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; diff --git a/include/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.hpp b/include/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.hpp index 8c93d0fb..4c370b92 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.hpp @@ -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; } diff --git a/include/MetroidPrime/ScriptObjects/CScriptAreaAttributes.hpp b/include/MetroidPrime/ScriptObjects/CScriptAreaAttributes.hpp index 254eb2f3..03da36ee 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptAreaAttributes.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptAreaAttributes.hpp @@ -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; } diff --git a/include/MetroidPrime/ScriptObjects/CScriptBallTrigger.hpp b/include/MetroidPrime/ScriptObjects/CScriptBallTrigger.hpp index b9fe0f71..9714889b 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptBallTrigger.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptBallTrigger.hpp @@ -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; diff --git a/include/MetroidPrime/ScriptObjects/CScriptBeam.hpp b/include/MetroidPrime/ScriptObjects/CScriptBeam.hpp index 9f27d502..4a53b317 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptBeam.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptBeam.hpp @@ -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 diff --git a/include/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.hpp b/include/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.hpp index 8826d178..f3fa52e9 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.hpp @@ -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 diff --git a/include/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.hpp b/include/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.hpp index d91ed884..616401e8 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.hpp @@ -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 diff --git a/include/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.hpp b/include/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.hpp index e053447d..eade3c9a 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.hpp @@ -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 diff --git a/include/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.hpp b/include/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.hpp index bba4f49b..503bd31c 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.hpp @@ -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; } diff --git a/include/MetroidPrime/ScriptObjects/CScriptCameraShaker.hpp b/include/MetroidPrime/ScriptObjects/CScriptCameraShaker.hpp index 0e09f4f6..a3412fdf 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptCameraShaker.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptCameraShaker.hpp @@ -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 diff --git a/include/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.hpp b/include/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.hpp index 252e5a7f..adcd02b1 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.hpp @@ -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; } diff --git a/include/MetroidPrime/ScriptObjects/CScriptControllerAction.hpp b/include/MetroidPrime/ScriptObjects/CScriptControllerAction.hpp index 053a4c20..a7cb8cbe 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptControllerAction.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptControllerAction.hpp @@ -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); }; diff --git a/include/MetroidPrime/ScriptObjects/CScriptCounter.hpp b/include/MetroidPrime/ScriptObjects/CScriptCounter.hpp index 207cb41f..006c7a0b 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptCounter.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptCounter.hpp @@ -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 diff --git a/include/MetroidPrime/ScriptObjects/CScriptCoverPoint.hpp b/include/MetroidPrime/ScriptObjects/CScriptCoverPoint.hpp index 1cd33ec2..5869fdeb 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptCoverPoint.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptCoverPoint.hpp @@ -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; diff --git a/include/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.hpp b/include/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.hpp index ce71800d..0d4882a6 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.hpp @@ -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; diff --git a/include/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.hpp b/include/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.hpp index d1d500af..dfb9c48f 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.hpp @@ -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; diff --git a/include/MetroidPrime/ScriptObjects/CScriptDistanceFog.hpp b/include/MetroidPrime/ScriptObjects/CScriptDistanceFog.hpp index 95d62ae7..b0ec93d8 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptDistanceFog.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptDistanceFog.hpp @@ -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 diff --git a/include/MetroidPrime/ScriptObjects/CScriptDock.hpp b/include/MetroidPrime/ScriptObjects/CScriptDock.hpp index 63f2cf6c..95849aa7 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptDock.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptDock.hpp @@ -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; } diff --git a/include/MetroidPrime/ScriptObjects/CScriptDockAreaChange.hpp b/include/MetroidPrime/ScriptObjects/CScriptDockAreaChange.hpp index 2fab00a8..4ecbea76 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptDockAreaChange.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptDockAreaChange.hpp @@ -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(); }; diff --git a/include/MetroidPrime/ScriptObjects/CScriptEMPulse.hpp b/include/MetroidPrime/ScriptObjects/CScriptEMPulse.hpp index eedb8e9a..1cf17733 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptEMPulse.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptEMPulse.hpp @@ -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; diff --git a/include/MetroidPrime/ScriptObjects/CScriptGenerator.hpp b/include/MetroidPrime/ScriptObjects/CScriptGenerator.hpp index 2e703be5..b5c179d9 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptGenerator.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptGenerator.hpp @@ -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; diff --git a/include/MetroidPrime/ScriptObjects/CScriptHUDMemo.hpp b/include/MetroidPrime/ScriptObjects/CScriptHUDMemo.hpp index 9f105659..f4efb12a 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptHUDMemo.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptHUDMemo.hpp @@ -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) diff --git a/include/MetroidPrime/ScriptObjects/CScriptMazeNode.hpp b/include/MetroidPrime/ScriptObjects/CScriptMazeNode.hpp index ee2e1dc5..53484e93 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptMazeNode.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptMazeNode.hpp @@ -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(); diff --git a/include/MetroidPrime/ScriptObjects/CScriptMidi.hpp b/include/MetroidPrime/ScriptObjects/CScriptMidi.hpp index 5e9ecf4c..58770074 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptMidi.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptMidi.hpp @@ -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; diff --git a/include/MetroidPrime/ScriptObjects/CScriptPickup.hpp b/include/MetroidPrime/ScriptObjects/CScriptPickup.hpp index 161f5aa8..795cb16f 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptPickup.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptPickup.hpp @@ -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; diff --git a/include/MetroidPrime/ScriptObjects/CScriptPickupGenerator.hpp b/include/MetroidPrime/ScriptObjects/CScriptPickupGenerator.hpp index e59ddaa6..0946b758 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptPickupGenerator.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptPickupGenerator.hpp @@ -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; diff --git a/include/MetroidPrime/ScriptObjects/CScriptPlatform.hpp b/include/MetroidPrime/ScriptObjects/CScriptPlatform.hpp index fa7079b0..8228fc80 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptPlatform.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptPlatform.hpp @@ -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; diff --git a/include/MetroidPrime/ScriptObjects/CScriptPlayerHint.hpp b/include/MetroidPrime/ScriptObjects/CScriptPlayerHint.hpp index 37aaf7f7..b845b83f 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptPlayerHint.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptPlayerHint.hpp @@ -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; } diff --git a/include/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.hpp b/include/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.hpp index 8864f0c0..f1393ee2 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.hpp @@ -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; } diff --git a/include/MetroidPrime/ScriptObjects/CScriptPointOfInterest.hpp b/include/MetroidPrime/ScriptObjects/CScriptPointOfInterest.hpp index 78d16ab0..979791ff 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptPointOfInterest.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptPointOfInterest.hpp @@ -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 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 GetTouchBounds() const override; }; #endif // _CSCRIPTPOINTOFINTEREST diff --git a/include/MetroidPrime/ScriptObjects/CScriptProjectedShadow.hpp b/include/MetroidPrime/ScriptObjects/CScriptProjectedShadow.hpp index d3e80ec0..96d130cd 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptProjectedShadow.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptProjectedShadow.hpp @@ -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; } diff --git a/include/MetroidPrime/ScriptObjects/CScriptRandomRelay.hpp b/include/MetroidPrime/ScriptObjects/CScriptRandomRelay.hpp index 0b01e73a..b5e98a7c 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptRandomRelay.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptRandomRelay.hpp @@ -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: diff --git a/include/MetroidPrime/ScriptObjects/CScriptRelay.hpp b/include/MetroidPrime/ScriptObjects/CScriptRelay.hpp index 357401b6..1ae3f78c 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptRelay.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptRelay.hpp @@ -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(); }; diff --git a/include/MetroidPrime/ScriptObjects/CScriptRipple.hpp b/include/MetroidPrime/ScriptObjects/CScriptRipple.hpp index 21e886bb..fefdf8bb 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptRipple.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptRipple.hpp @@ -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 diff --git a/include/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.hpp b/include/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.hpp index 5ebecdef..6fa5e01f 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.hpp @@ -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(); diff --git a/include/MetroidPrime/ScriptObjects/CScriptSpawnPoint.hpp b/include/MetroidPrime/ScriptObjects/CScriptSpawnPoint.hpp index 451d2bbd..a665e242 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptSpawnPoint.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptSpawnPoint.hpp @@ -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; diff --git a/include/MetroidPrime/ScriptObjects/CScriptSpecialFunction.hpp b/include/MetroidPrime/ScriptObjects/CScriptSpecialFunction.hpp index 6a9f25b5..979109f1 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptSpecialFunction.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptSpecialFunction.hpp @@ -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&); diff --git a/include/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.hpp b/include/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.hpp index eeaa2cca..c0bc7a81 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.hpp @@ -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; } }; diff --git a/include/MetroidPrime/ScriptObjects/CScriptStreamedAudio.hpp b/include/MetroidPrime/ScriptObjects/CScriptStreamedAudio.hpp index 133a4328..4024b32a 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptStreamedAudio.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptStreamedAudio.hpp @@ -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; diff --git a/include/MetroidPrime/ScriptObjects/CScriptTargetingPoint.hpp b/include/MetroidPrime/ScriptObjects/CScriptTargetingPoint.hpp index 22ad3d54..5b01e8fe 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptTargetingPoint.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptTargetingPoint.hpp @@ -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; }; diff --git a/include/MetroidPrime/ScriptObjects/CScriptTrigger.hpp b/include/MetroidPrime/ScriptObjects/CScriptTrigger.hpp index d74ed405..f6896d72 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptTrigger.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptTrigger.hpp @@ -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 GetTouchBounds() const; - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); - void Think(float, CStateManager&); + rstl::optional_object GetTouchBounds() const override; + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; + void Think(float, CStateManager&) override; void UpdateInhabitants(float, CStateManager&); const rstl::list& 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&); diff --git a/include/MetroidPrime/ScriptObjects/CScriptVisorFlare.hpp b/include/MetroidPrime/ScriptObjects/CScriptVisorFlare.hpp index 6bda3d1a..20266552 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptVisorFlare.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptVisorFlare.hpp @@ -15,12 +15,12 @@ public: const rstl::vector& 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 diff --git a/include/MetroidPrime/ScriptObjects/CScriptVisorGoo.hpp b/include/MetroidPrime/ScriptObjects/CScriptVisorGoo.hpp index 18ffb946..3dc36354 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptVisorGoo.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptVisorGoo.hpp @@ -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; diff --git a/include/MetroidPrime/ScriptObjects/CScriptWaypoint.hpp b/include/MetroidPrime/ScriptObjects/CScriptWaypoint.hpp index 22870c28..82f654dd 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptWaypoint.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptWaypoint.hpp @@ -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; diff --git a/include/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.hpp b/include/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.hpp index 764fd44c..485e7bbf 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.hpp @@ -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; } diff --git a/include/MetroidPrime/TCastTo.hpp b/include/MetroidPrime/TCastTo.hpp index c0a956f6..fb8a85c1 100644 --- a/include/MetroidPrime/TCastTo.hpp +++ b/include/MetroidPrime/TCastTo.hpp @@ -84,7 +84,7 @@ public: TCastToPtr(CEntity& p); operator T*() const { return ptr; } -#define VISIT(cls) void Visit(cls& p); +#define VISIT(cls) void Visit(cls& p) override; TCASTTO_VISITORS #undef VISIT diff --git a/include/MetroidPrime/Tweaks/CTweakBall.hpp b/include/MetroidPrime/Tweaks/CTweakBall.hpp index 58d8abdf..a6dfb92e 100644 --- a/include/MetroidPrime/Tweaks/CTweakBall.hpp +++ b/include/MetroidPrime/Tweaks/CTweakBall.hpp @@ -14,7 +14,7 @@ class CTweakBall; class CTweakBall : public ITweakObject, public TOneStatic< CTweakBall > { public: - ~CTweakBall(); + ~CTweakBall() override; CTweakBall(CInputStream&); float GetMaxBallTranslationAcceleration(int s) const { return x4_maxTranslationAcceleration[s]; } diff --git a/include/MetroidPrime/Tweaks/CTweakGame.hpp b/include/MetroidPrime/Tweaks/CTweakGame.hpp index a769042b..60286d4b 100644 --- a/include/MetroidPrime/Tweaks/CTweakGame.hpp +++ b/include/MetroidPrime/Tweaks/CTweakGame.hpp @@ -14,7 +14,7 @@ class CTweakGame; class CTweakGame : public ITweakObject, public TOneStatic< CTweakGame > { public: CTweakGame(CInputStream&); - ~CTweakGame(); + ~CTweakGame() override; const rstl::string& GetWorldPrefix() { return x4_worldPrefix; } const rstl::string& GetDefaultRoom() const { return x14_defaultRoom; } diff --git a/include/MetroidPrime/Tweaks/CTweakGuiColors.hpp b/include/MetroidPrime/Tweaks/CTweakGuiColors.hpp index 653410a8..48774da6 100644 --- a/include/MetroidPrime/Tweaks/CTweakGuiColors.hpp +++ b/include/MetroidPrime/Tweaks/CTweakGuiColors.hpp @@ -13,7 +13,7 @@ class CTweakGuiColors; class CTweakGuiColors : public ITweakObject, public TOneStatic< CTweakGuiColors > { public: - ~CTweakGuiColors(); + ~CTweakGuiColors() override; CTweakGuiColors(CInputStream& in); const CColor& GetPauseBlurFilterColor() const { return x4_pauseBlurFilterColor; } diff --git a/include/MetroidPrime/Tweaks/CTweakGunRes.hpp b/include/MetroidPrime/Tweaks/CTweakGunRes.hpp index 2219deb0..45ba6eee 100644 --- a/include/MetroidPrime/Tweaks/CTweakGunRes.hpp +++ b/include/MetroidPrime/Tweaks/CTweakGunRes.hpp @@ -21,7 +21,7 @@ public: ResId* d; }; - ~CTweakGunRes(); + ~CTweakGunRes() override; ResId x4_gunMotion; ResId x8_grappleArm; diff --git a/include/MetroidPrime/Tweaks/CTweakPlayer.hpp b/include/MetroidPrime/Tweaks/CTweakPlayer.hpp index 7fe3971a..6a5c2237 100644 --- a/include/MetroidPrime/Tweaks/CTweakPlayer.hpp +++ b/include/MetroidPrime/Tweaks/CTweakPlayer.hpp @@ -15,7 +15,7 @@ class CTweakPlayer; class CTweakPlayer : public ITweakObject, public TOneStatic< CTweakPlayer > { public: CTweakPlayer(CInputStream&); - ~CTweakPlayer(); + ~CTweakPlayer() override; // TODO CPlayer::ESurfaceRestraints float GetMaxTranslationalAcceleration(int s) const { return x4_maxTranslationalAcceleration[s]; } diff --git a/include/MetroidPrime/Tweaks/CTweakPlayerControl.hpp b/include/MetroidPrime/Tweaks/CTweakPlayerControl.hpp index 5ceda3e5..8fde91fb 100644 --- a/include/MetroidPrime/Tweaks/CTweakPlayerControl.hpp +++ b/include/MetroidPrime/Tweaks/CTweakPlayerControl.hpp @@ -15,7 +15,7 @@ class CTweakPlayerControl; class CTweakPlayerControl : public ITweakObject { public: CTweakPlayerControl(CInputStream&); - ~CTweakPlayerControl(); + ~CTweakPlayerControl() override; ControlMapper::EFunctionList GetMapping(ControlMapper::ECommands command) const; diff --git a/include/MetroidPrime/Tweaks/CTweakPlayerGun.hpp b/include/MetroidPrime/Tweaks/CTweakPlayerGun.hpp index ea071a89..203d1043 100644 --- a/include/MetroidPrime/Tweaks/CTweakPlayerGun.hpp +++ b/include/MetroidPrime/Tweaks/CTweakPlayerGun.hpp @@ -65,7 +65,7 @@ struct SWeaponInfo { class CTweakPlayerGun : public ITweakObject { public: - ~CTweakPlayerGun(); + ~CTweakPlayerGun() override; float GetUpLookAngle() const { return x4_upLookAngle; } float GetDownLookAngle() const { return x8_downLookAngle; } diff --git a/include/MetroidPrime/Weapons/CBeamProjectile.hpp b/include/MetroidPrime/Weapons/CBeamProjectile.hpp index e4654020..23374a6a 100644 --- a/include/MetroidPrime/Weapons/CBeamProjectile.hpp +++ b/include/MetroidPrime/Weapons/CBeamProjectile.hpp @@ -21,13 +21,13 @@ public: EProjectileAttrib attribs, bool growingBeam); // CEntity - ~CBeamProjectile(); - void Accept(IVisitor& visitor); + ~CBeamProjectile() override; + void Accept(IVisitor& visitor) override; // CActor - rstl::optional_object GetTouchBounds() const; - void Touch(CActor&, CStateManager&); - void CalculateRenderBounds(); + rstl::optional_object GetTouchBounds() const override; + void Touch(CActor&, CStateManager&) override; + void CalculateRenderBounds() override; // CBeamProjectile virtual void UpdateFx(const CTransform4f&, float, CStateManager&); diff --git a/include/MetroidPrime/Weapons/CElectricBeamProjectile.hpp b/include/MetroidPrime/Weapons/CElectricBeamProjectile.hpp index 7106a25a..42bf954e 100644 --- a/include/MetroidPrime/Weapons/CElectricBeamProjectile.hpp +++ b/include/MetroidPrime/Weapons/CElectricBeamProjectile.hpp @@ -23,17 +23,17 @@ public: const CDamageInfo&, TUniqueId, TAreaId, TUniqueId, EProjectileAttrib); // CEntity - void Accept(IVisitor&); - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); + void Accept(IVisitor&) override; + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; // CActor - void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const; - void Touch(CActor&, CStateManager&); + void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override; + void Touch(CActor&, CStateManager&) override; // CBeamProjectile - void UpdateFx(const CTransform4f&, float, CStateManager&); - void ResetBeam(CStateManager&, bool); - void Fire(const CTransform4f&, CStateManager&, bool); + void UpdateFx(const CTransform4f&, float, CStateManager&) override; + void ResetBeam(CStateManager&, bool) override; + void Fire(const CTransform4f&, CStateManager&, bool) override; private: rstl::single_ptr< CParticleElectric > x468_electric; diff --git a/include/MetroidPrime/Weapons/CEnergyProjectile.hpp b/include/MetroidPrime/Weapons/CEnergyProjectile.hpp index 7822066f..aa77efed 100644 --- a/include/MetroidPrime/Weapons/CEnergyProjectile.hpp +++ b/include/MetroidPrime/Weapons/CEnergyProjectile.hpp @@ -19,19 +19,19 @@ public: ushort visorSfx, bool sendCollideMsg); // CEntity - ~CEnergyProjectile(); - void Accept(IVisitor& visitor); - void Think(float dt, CStateManager& mgr); - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); + ~CEnergyProjectile() override; + void Accept(IVisitor& visitor) override; + void Think(float dt, CStateManager& mgr) override; + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; // CActor - void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const; - void Render(const CStateManager&) const; - void Touch(CActor&, CStateManager&); + void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override; + void Render(const CStateManager&) const override; + void Touch(CActor&, CStateManager&) override; // CGameProjectile void ResolveCollisionWithActor(const CRayCastResult& res, CActor& act, - CStateManager& mgr); + CStateManager& mgr) override; // CEnergyProjectile virtual bool Explode(const CVector3f& pos, const CVector3f& normal, diff --git a/include/MetroidPrime/Weapons/CGameProjectile.hpp b/include/MetroidPrime/Weapons/CGameProjectile.hpp index 97992b62..180e1e42 100644 --- a/include/MetroidPrime/Weapons/CGameProjectile.hpp +++ b/include/MetroidPrime/Weapons/CGameProjectile.hpp @@ -26,14 +26,14 @@ public: ushort visorSfx, bool sendCollideMsg); // CEntity - ~CGameProjectile(); - void Accept(IVisitor& visitor); - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); + ~CGameProjectile() override; + void Accept(IVisitor& visitor) override; + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; // CActor - void Render(const CStateManager&) const; - rstl::optional_object< CAABox > GetTouchBounds() const; - void FluidFXThink(EFluidState, CScriptWater&, CStateManager&); + void Render(const CStateManager&) const override; + rstl::optional_object< CAABox > GetTouchBounds() const override; + void FluidFXThink(EFluidState, CScriptWater&, CStateManager&) override; // CGameProjectile virtual void ResolveCollisionWithActor(const CRayCastResult& res, CActor& act, diff --git a/include/MetroidPrime/Weapons/CIceBeam.hpp b/include/MetroidPrime/Weapons/CIceBeam.hpp index 1c10667f..bf747f6a 100644 --- a/include/MetroidPrime/Weapons/CIceBeam.hpp +++ b/include/MetroidPrime/Weapons/CIceBeam.hpp @@ -9,24 +9,24 @@ class CIceBeam : public CGunWeapon { public: CIceBeam(CAssetId characterId, EWeaponType type, TUniqueId playerId, EMaterialTypes playerMaterial, const CVector3f& scale); - ~CIceBeam(); + ~CIceBeam() override; // CGunWeapon - void PreRenderGunFx(const CStateManager& mgr, const CTransform4f& xf); - void PostRenderGunFx(const CStateManager& mgr, const CTransform4f& xf); + void PreRenderGunFx(const CStateManager& mgr, const CTransform4f& xf) override; + void PostRenderGunFx(const CStateManager& mgr, const CTransform4f& xf) override; void UpdateGunFx(bool shotSmoke, float dt, const CStateManager& mgr, - const CTransform4f& xf); - void Update(float dt, CStateManager& mgr); + const CTransform4f& xf) override; + void Update(float dt, CStateManager& mgr) override; void Fire(bool underwater, float dt, CPlayerState::EChargeStage chargeState, const CTransform4f& xf, CStateManager& mgr, TUniqueId homingTarget, float chargeFactor1, - float chargeFactor2); + float chargeFactor2) override; - void Load(CStateManager& mgr, bool subtypeBasePose); - void Unload(CStateManager& mgr); - bool IsLoaded() const; + void Load(CStateManager& mgr, bool subtypeBasePose) override; + void Unload(CStateManager& mgr) override; + bool IsLoaded() const override; - void EnableFx(bool enable); - void EnableSecondaryFx(ESecondaryFxType type); + void EnableFx(bool enable) override; + void EnableSecondaryFx(ESecondaryFxType type) override; private: TCachedToken< CGenDescription > x21c_iceSmoke; diff --git a/include/MetroidPrime/Weapons/CPlasmaBeam.hpp b/include/MetroidPrime/Weapons/CPlasmaBeam.hpp index 6793234d..282faa57 100644 --- a/include/MetroidPrime/Weapons/CPlasmaBeam.hpp +++ b/include/MetroidPrime/Weapons/CPlasmaBeam.hpp @@ -11,21 +11,21 @@ public: CPlasmaBeam(CAssetId characterId, EWeaponType type, TUniqueId playerId, EMaterialTypes playerMaterial, const CVector3f& scale); - ~CPlasmaBeam(); + ~CPlasmaBeam() override; // CGunWeapon - void PostRenderGunFx(const CStateManager& mgr, const CTransform4f& xf); + void PostRenderGunFx(const CStateManager& mgr, const CTransform4f& xf) override; void UpdateGunFx(bool shotSmoke, float dt, const CStateManager& mgr, - const CTransform4f& xf); - void Update(float dt, CStateManager& mgr); + const CTransform4f& xf) override; + void Update(float dt, CStateManager& mgr) override; void Fire(bool underwater, float dt, CPlayerState::EChargeStage chargeState, const CTransform4f& xf, CStateManager& mgr, TUniqueId homingTarget, float chargeFactor1, - float chargeFactor2); + float chargeFactor2) override; - void Load(CStateManager& mgr, bool subtypeBasePose); - void Unload(CStateManager& mgr); - bool IsLoaded() const; - void EnableSecondaryFx(ESecondaryFxType type); + void Load(CStateManager& mgr, bool subtypeBasePose) override; + void Unload(CStateManager& mgr) override; + bool IsLoaded() const override; + void EnableSecondaryFx(ESecondaryFxType type) override; bool IsFiring(const CStateManager& mgr) const; void StopBeam(CStateManager& mgr, bool b1); diff --git a/include/MetroidPrime/Weapons/CPlasmaProjectile.hpp b/include/MetroidPrime/Weapons/CPlasmaProjectile.hpp index acc23987..1e33347d 100644 --- a/include/MetroidPrime/Weapons/CPlasmaProjectile.hpp +++ b/include/MetroidPrime/Weapons/CPlasmaProjectile.hpp @@ -35,15 +35,15 @@ public: TUniqueId owner, const PlayerEffectResources& res, bool growingBeam, EProjectileAttrib attribs); - void Accept(IVisitor& visitor); - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CStateManager& mgr); - void ResetBeam(CStateManager& mgr, bool fullReset); - void UpdateFx(const CTransform4f& xf, float dt, CStateManager& mgr); - void Fire(const CTransform4f& xf, CStateManager& mgr, bool b); - void Touch(CActor& other, CStateManager& mgr); - bool CanRenderUnsorted(const CStateManager& mgr) const; - void AddToRenderer(const CFrustumPlanes& frustum, const CStateManager& mgr) const; - void Render(const CStateManager& mgr) const; + void Accept(IVisitor& visitor) override; + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CStateManager& mgr) override; + void ResetBeam(CStateManager& mgr, bool fullReset) override; + void UpdateFx(const CTransform4f& xf, float dt, CStateManager& mgr) override; + void Fire(const CTransform4f& xf, CStateManager& mgr, bool b) override; + void Touch(CActor& other, CStateManager& mgr) override; + bool CanRenderUnsorted(const CStateManager& mgr) const override; + void AddToRenderer(const CFrustumPlanes& frustum, const CStateManager& mgr) const override; + void Render(const CStateManager& mgr) const override; CColor GetInnerColor() const { return x490_innerColor; } CColor GetOuterColor() const { return x494_outerColor; } bool IsFiring() const { return x548_26_firing; } diff --git a/include/MetroidPrime/Weapons/CPowerBeam.hpp b/include/MetroidPrime/Weapons/CPowerBeam.hpp index 5fca3e39..b8a0843d 100644 --- a/include/MetroidPrime/Weapons/CPowerBeam.hpp +++ b/include/MetroidPrime/Weapons/CPowerBeam.hpp @@ -13,16 +13,16 @@ public: EMaterialTypes playerMaterial, const CVector3f& scale); ~CPowerBeam(); - void PreRenderGunFx(const CStateManager& mgr, const CTransform4f& xf); - void PostRenderGunFx(const CStateManager& mgr, const CTransform4f& xf); - void UpdateGunFx(bool shotSmoke, float dt, const CStateManager& mgr, const CTransform4f& xf); + void PreRenderGunFx(const CStateManager& mgr, const CTransform4f& xf) override; + void PostRenderGunFx(const CStateManager& mgr, const CTransform4f& xf) override; + void UpdateGunFx(bool shotSmoke, float dt, const CStateManager& mgr, const CTransform4f& xf) override; void Fire(bool underwater, float dt, CPlayerState::EChargeStage chargeState, const CTransform4f& xf, CStateManager& mgr, - TUniqueId homingTarget, float chargeFactor1, float chargeFactor2); - void EnableSecondaryFx(ESecondaryFxType type); - void Update(float dt, CStateManager& mgr); - void Load(CStateManager& mgr, bool subtypeBasePose); - void Unload(CStateManager& mgr); - bool IsLoaded() const; + TUniqueId homingTarget, float chargeFactor1, float chargeFactor2) override; + void EnableSecondaryFx(ESecondaryFxType type) override; + void Update(float dt, CStateManager& mgr) override; + void Load(CStateManager& mgr, bool subtypeBasePose) override; + void Unload(CStateManager& mgr) override; + bool IsLoaded() const override; private: enum ESmokeState { kSS_Inactive, kSS_Active, kSS_Done }; diff --git a/include/MetroidPrime/Weapons/CPowerBomb.hpp b/include/MetroidPrime/Weapons/CPowerBomb.hpp index 033e7553..bbe05394 100644 --- a/include/MetroidPrime/Weapons/CPowerBomb.hpp +++ b/include/MetroidPrime/Weapons/CPowerBomb.hpp @@ -14,13 +14,13 @@ public: TUniqueId playerId, const CTransform4f& xf, const CDamageInfo& dInfo); ~CPowerBomb(); - void Accept(IVisitor& visitor); - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); - void Think(float, CStateManager&); - void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const; - void Render(const CStateManager&) const; - rstl::optional_object GetTouchBounds() const; - void Touch(CActor&, CStateManager&); + void Accept(IVisitor& visitor) override; + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; + void Think(float, CStateManager&) override; + void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override; + void Render(const CStateManager&) const override; + rstl::optional_object GetTouchBounds() const override; + void Touch(CActor&, CStateManager&) override; float GetCurTime() const { return x15c_curTime; } void ApplyDynamicDamage(const CVector3f&, CStateManager&); diff --git a/include/MetroidPrime/Weapons/CTargetableProjectile.hpp b/include/MetroidPrime/Weapons/CTargetableProjectile.hpp index 8e1bb4c0..010fe5e1 100644 --- a/include/MetroidPrime/Weapons/CTargetableProjectile.hpp +++ b/include/MetroidPrime/Weapons/CTargetableProjectile.hpp @@ -15,19 +15,19 @@ public: ushort visorSfx, bool sendCollideMsg); // CEntity - ~CTargetableProjectile(); - void Accept(IVisitor&); + ~CTargetableProjectile() override; + void Accept(IVisitor&) override; // CACtor - CVector3f GetAimPosition(const CStateManager&, float) const; + CVector3f GetAimPosition(const CStateManager&, float) const override; // CGameProjectile void ResolveCollisionWithActor(const CRayCastResult& res, CActor& act, - CStateManager& mgr); + CStateManager& mgr) override; // CEnergyProjectile bool Explode(const CVector3f& pos, const CVector3f& normal, EWeaponCollisionResponseTypes type, - CStateManager& mgr, const CDamageVulnerability& dVuln, TUniqueId hitActor); + CStateManager& mgr, const CDamageVulnerability& dVuln, TUniqueId hitActor) override; private: TToken< CWeaponDescription > x3d8_weaponDesc; diff --git a/include/MetroidPrime/Weapons/CWaveBeam.hpp b/include/MetroidPrime/Weapons/CWaveBeam.hpp index 139640da..ad391114 100644 --- a/include/MetroidPrime/Weapons/CWaveBeam.hpp +++ b/include/MetroidPrime/Weapons/CWaveBeam.hpp @@ -14,19 +14,19 @@ class CWaveBeam : public CGunWeapon { public: CWaveBeam(CAssetId characterId, EWeaponType type, TUniqueId playerId, EMaterialTypes playerMaterial, const CVector3f& scale); - ~CWaveBeam(); + ~CWaveBeam() override; - void PostRenderGunFx(const CStateManager& mgr, const CTransform4f& xf); + void PostRenderGunFx(const CStateManager& mgr, const CTransform4f& xf) override; void UpdateGunFx(bool shotSmoke, float dt, const CStateManager& mgr, - const CTransform4f& xf); + const CTransform4f& xf) override; void Fire(bool underwater, float dt, CPlayerState::EChargeStage chargeState, const CTransform4f& xf, CStateManager& mgr, TUniqueId homingTarget, float chargeFactor1, - float chargeFactor2); - void EnableSecondaryFx(ESecondaryFxType type); - void Update(float dt, CStateManager& mgr); - void Load(CStateManager& mgr, bool subtypeBasePose); - void Unload(CStateManager& mgr); - bool IsLoaded() const; + float chargeFactor2) override; + void EnableSecondaryFx(ESecondaryFxType type) override; + void Update(float dt, CStateManager& mgr) override; + void Load(CStateManager& mgr, bool subtypeBasePose) override; + void Unload(CStateManager& mgr) override; + bool IsLoaded() const override; private: TCachedToken< CWeaponDescription > x21c_waveBeam; diff --git a/include/MetroidPrime/Weapons/CWeapon.hpp b/include/MetroidPrime/Weapons/CWeapon.hpp index 5f7e97db..4281de7d 100644 --- a/include/MetroidPrime/Weapons/CWeapon.hpp +++ b/include/MetroidPrime/Weapons/CWeapon.hpp @@ -15,15 +15,15 @@ public: const CModelData& mData); // CEntity - ~CWeapon(); - void Think(float dt, CStateManager& mgr); + ~CWeapon() override; + void Think(float dt, CStateManager& mgr) override; // CActor - void Render(const CStateManager&) const; + void Render(const CStateManager&) const override; EWeaponCollisionResponseTypes GetCollisionResponseType(const CVector3f&, const CVector3f&, const CWeaponMode&, - int /*EProjectileAttrib?*/) const; - void FluidFXThink(EFluidState, CScriptWater&, CStateManager&); + int /*EProjectileAttrib?*/) const override; + void FluidFXThink(EFluidState, CScriptWater&, CStateManager&) override; void SetDamageFalloffSpeed(float d); diff --git a/include/WorldFormat/CCollidableOBBTreeGroup.hpp b/include/WorldFormat/CCollidableOBBTreeGroup.hpp index 38553f92..e55931b5 100644 --- a/include/WorldFormat/CCollidableOBBTreeGroup.hpp +++ b/include/WorldFormat/CCollidableOBBTreeGroup.hpp @@ -26,12 +26,12 @@ public: CCollidableOBBTreeGroup(CCollidableOBBTreeGroupContainer* container, const CMaterialList& matList); - uint GetTableIndex() const; - CAABox CalculateAABox(const CTransform4f&) const; - CAABox CalculateLocalAABox() const; - FourCC GetPrimType() const; - ~CCollidableOBBTreeGroup() {} - CRayCastResult CastRayInternal(const CInternalRayCastStructure&) const; + uint GetTableIndex() const override; + CAABox CalculateAABox(const CTransform4f&) const override; + CAABox CalculateLocalAABox() const override; + FourCC GetPrimType() const override; + ~CCollidableOBBTreeGroup() override {} + CRayCastResult CastRayInternal(const CInternalRayCastStructure&) const override; private: CCollidableOBBTreeGroupContainer* x10_container; diff --git a/include/dolphin/types.h b/include/dolphin/types.h index 39bf311c..7180dc04 100644 --- a/include/dolphin/types.h +++ b/include/dolphin/types.h @@ -68,6 +68,13 @@ typedef int BOOL; #ifndef nullptr #define nullptr NULL #endif + +#if defined(__MWERKS__) +#ifndef override +#define override +#endif +#endif + #endif #ifndef ATTRIBUTE_ALIGN diff --git a/src/Kyoto/zlib/contrib/delphi2/zlib.pas b/src/Kyoto/zlib/contrib/delphi2/zlib.pas index 29202468..10ae4cae 100644 --- a/src/Kyoto/zlib/contrib/delphi2/zlib.pas +++ b/src/Kyoto/zlib/contrib/delphi2/zlib.pas @@ -87,10 +87,10 @@ type function GetCompressionRate: Single; public constructor Create(CompressionLevel: TCompressionLevel; Dest: TStream); - destructor Destroy;; - function Read(var Buffer; Count: Longint): Longint;; - function Write(const Buffer; Count: Longint): Longint;; - function Seek(Offset: Longint; Origin: Word): Longint;; + destructor Destroy; override; + function Read(var Buffer; Count: Longint): Longint; override; + function Write(const Buffer; Count: Longint): Longint; override; + function Seek(Offset: Longint; Origin: Word): Longint; override; property CompressionRate: Single read GetCompressionRate; property OnProgress; end; @@ -116,10 +116,10 @@ type TDecompressionStream = class(TCustomZlibStream) public constructor Create(Source: TStream); - destructor Destroy;; - function Read(var Buffer; Count: Longint): Longint;; - function Write(const Buffer; Count: Longint): Longint;; - function Seek(Offset: Longint; Origin: Word): Longint;; + destructor Destroy; override; + function Read(var Buffer; Count: Longint): Longint; override; + function Write(const Buffer; Count: Longint): Longint; override; + function Seek(Offset: Longint; Origin: Word): Longint; override; property OnProgress; end; diff --git a/src/MetroidPrime/TCastTo.cpp b/src/MetroidPrime/TCastTo.cpp index 0044adb8..9dab4577 100644 --- a/src/MetroidPrime/TCastTo.cpp +++ b/src/MetroidPrime/TCastTo.cpp @@ -9,8 +9,8 @@ #define STUB(cls, parent) \ class cls : public parent { \ public: \ - ~cls(); \ - void Accept(IVisitor& visitor); \ + ~cls() override; \ + void Accept(IVisitor& visitor) override; \ }; STUB(CWeapon, CActor) STUB(CBomb, CWeapon)