diff --git a/src/Core/Resource/Animation/CAnimSet.h b/src/Core/Resource/Animation/CAnimSet.h index 2822fb83..33ecff2d 100644 --- a/src/Core/Resource/Animation/CAnimSet.h +++ b/src/Core/Resource/Animation/CAnimSet.h @@ -108,7 +108,7 @@ public: : CResource(pEntry) {} - ~CAnimSet() + ~CAnimSet() override { // For MP2, anim events need to be cleaned up manually for ([[maybe_unused]] const auto& event : mAnimEvents) @@ -117,7 +117,7 @@ public: } } - std::unique_ptr BuildDependencyTree() const + std::unique_ptr BuildDependencyTree() const override { auto pTree = std::make_unique(); diff --git a/src/Core/Resource/Animation/CSourceAnimData.h b/src/Core/Resource/Animation/CSourceAnimData.h index 3bcb8c55..eb4bb8f8 100644 --- a/src/Core/Resource/Animation/CSourceAnimData.h +++ b/src/Core/Resource/Animation/CSourceAnimData.h @@ -33,7 +33,7 @@ public: : CResource(pEntry) {} - ~CSourceAnimData() = default; + ~CSourceAnimData() override = default; std::unique_ptr BuildDependencyTree() const override { diff --git a/src/Core/Resource/Animation/IMetaAnimation.h b/src/Core/Resource/Animation/IMetaAnimation.h index bf3b6f54..713c77e8 100644 --- a/src/Core/Resource/Animation/IMetaAnimation.h +++ b/src/Core/Resource/Animation/IMetaAnimation.h @@ -100,7 +100,7 @@ protected: public: CMetaAnimBlend(EMetaAnimType Type, IInputStream& rInput, EGame Game); - ~CMetaAnimBlend(); + ~CMetaAnimBlend() override; EMetaAnimType Type() const override; void GetUniquePrimitives(std::set& rPrimSet) const override; @@ -126,7 +126,7 @@ protected: public: CMetaAnimRandom(IInputStream& rInput, EGame Game); - ~CMetaAnimRandom(); + ~CMetaAnimRandom() override; EMetaAnimType Type() const override; void GetUniquePrimitives(std::set& rPrimSet) const override; }; @@ -139,7 +139,7 @@ protected: public: CMetaAnimSequence(IInputStream& rInput, EGame Game); - ~CMetaAnimSequence(); + ~CMetaAnimSequence() override; EMetaAnimType Type() const override; void GetUniquePrimitives(std::set& rPrimSet) const override; }; diff --git a/src/Core/Resource/Animation/IMetaTransition.h b/src/Core/Resource/Animation/IMetaTransition.h index 586548d1..aec2b7d9 100644 --- a/src/Core/Resource/Animation/IMetaTransition.h +++ b/src/Core/Resource/Animation/IMetaTransition.h @@ -44,7 +44,7 @@ class CMetaTransMetaAnim : public IMetaTransition public: CMetaTransMetaAnim(IInputStream& rInput, EGame Game); - ~CMetaTransMetaAnim(); + ~CMetaTransMetaAnim() override; EMetaTransType Type() const override; void GetUniquePrimitives(std::set& rPrimSet) const override; }; diff --git a/src/Core/Resource/Area/CGameArea.h b/src/Core/Resource/Area/CGameArea.h index 036c925f..0f5816a2 100644 --- a/src/Core/Resource/Area/CGameArea.h +++ b/src/Core/Resource/Area/CGameArea.h @@ -68,7 +68,7 @@ class CGameArea : public CResource public: explicit CGameArea(CResourceEntry *pEntry = nullptr); - ~CGameArea(); + ~CGameArea() override; std::unique_ptr BuildDependencyTree() const override; void AddWorldModel(std::unique_ptr&& pModel); diff --git a/src/Core/Resource/CDependencyGroup.h b/src/Core/Resource/CDependencyGroup.h index 9ddc6b78..32e4862d 100644 --- a/src/Core/Resource/CDependencyGroup.h +++ b/src/Core/Resource/CDependencyGroup.h @@ -45,7 +45,7 @@ public: [&rkID](const auto& entry) { return entry == rkID; }); } - std::unique_ptr BuildDependencyTree() const + std::unique_ptr BuildDependencyTree() const override { auto pTree = std::make_unique(); diff --git a/src/Core/Resource/CFont.h b/src/Core/Resource/CFont.h index 83809bdd..ee28078b 100644 --- a/src/Core/Resource/CFont.h +++ b/src/Core/Resource/CFont.h @@ -62,7 +62,7 @@ class CFont : public CResource public: explicit CFont(CResourceEntry *pEntry = nullptr); - ~CFont(); + ~CFont() override; std::unique_ptr BuildDependencyTree() const override; CVector2f RenderString(const TString& rkString, CRenderer *pRenderer, float AspectRatio, CVector2f Position = CVector2f(0,0), diff --git a/src/Core/Resource/CTexture.h b/src/Core/Resource/CTexture.h index 71751de9..5378529b 100644 --- a/src/Core/Resource/CTexture.h +++ b/src/Core/Resource/CTexture.h @@ -33,7 +33,7 @@ class CTexture : public CResource public: explicit CTexture(CResourceEntry *pEntry = nullptr); CTexture(uint32 Width, uint32 Height); - ~CTexture(); + ~CTexture() override; bool BufferGL(); void Bind(uint32 GLTextureUnit); diff --git a/src/Core/Resource/CWorld.h b/src/Core/Resource/CWorld.h index f175cc89..5517ffc7 100644 --- a/src/Core/Resource/CWorld.h +++ b/src/Core/Resource/CWorld.h @@ -89,7 +89,7 @@ class CWorld : public CResource public: explicit CWorld(CResourceEntry *pEntry = nullptr); - ~CWorld(); + ~CWorld() override; std::unique_ptr BuildDependencyTree() const override; void SetAreaLayerInfo(CGameArea *pArea); diff --git a/src/Core/Resource/Collision/CCollisionMeshGroup.h b/src/Core/Resource/Collision/CCollisionMeshGroup.h index de20ffc1..416c31cf 100644 --- a/src/Core/Resource/Collision/CCollisionMeshGroup.h +++ b/src/Core/Resource/Collision/CCollisionMeshGroup.h @@ -15,7 +15,7 @@ class CCollisionMeshGroup : public CResource public: explicit CCollisionMeshGroup(CResourceEntry *pEntry = nullptr) : CResource(pEntry) {} - ~CCollisionMeshGroup() = default; + ~CCollisionMeshGroup() override = default; size_t NumMeshes() const { return mMeshes.size(); } CCollisionMesh* MeshByIndex(size_t Index) const { return mMeshes[Index].get(); } diff --git a/src/Core/Resource/Model/CBasicModel.h b/src/Core/Resource/Model/CBasicModel.h index 83f1cf2d..2d90ec4a 100644 --- a/src/Core/Resource/Model/CBasicModel.h +++ b/src/Core/Resource/Model/CBasicModel.h @@ -22,7 +22,7 @@ protected: public: explicit CBasicModel(CResourceEntry *pEntry = nullptr); - ~CBasicModel(); + ~CBasicModel() override; size_t GetVertexCount() const; size_t GetTriangleCount() const; diff --git a/src/Core/Resource/Model/CModel.h b/src/Core/Resource/Model/CModel.h index dcdfc235..29ce221e 100644 --- a/src/Core/Resource/Model/CModel.h +++ b/src/Core/Resource/Model/CModel.h @@ -23,7 +23,7 @@ class CModel : public CBasicModel public: explicit CModel(CResourceEntry *pEntry = nullptr); CModel(CMaterialSet *pSet, bool OwnsMatSet); - ~CModel(); + ~CModel() override; std::unique_ptr BuildDependencyTree() const override; void BufferGL(); diff --git a/src/Core/Resource/Model/CStaticModel.h b/src/Core/Resource/Model/CStaticModel.h index 8beefe09..389340d7 100644 --- a/src/Core/Resource/Model/CStaticModel.h +++ b/src/Core/Resource/Model/CStaticModel.h @@ -18,12 +18,12 @@ class CStaticModel : public CBasicModel public: CStaticModel(); explicit CStaticModel(CMaterial *pMat); - ~CStaticModel(); + ~CStaticModel() override; void AddSurface(SSurface *pSurface); void BufferGL(); void GenerateMaterialShaders(); - void ClearGLBuffer(); + void ClearGLBuffer() override; void Draw(FRenderOptions Options); void DrawSurface(FRenderOptions Options, uint32 Surface); void DrawWireframe(FRenderOptions Options, CColor WireColor = CColor::White()); diff --git a/src/Core/Scene/CRootNode.h b/src/Core/Scene/CRootNode.h index 7465b6d0..6e3afbfe 100644 --- a/src/Core/Scene/CRootNode.h +++ b/src/Core/Scene/CRootNode.h @@ -9,7 +9,7 @@ class CRootNode : public CSceneNode public: explicit CRootNode(CScene *pScene, uint32 NodeID, CSceneNode *pParent = nullptr) : CSceneNode(pScene, NodeID, pParent) {} - ~CRootNode() = default; + ~CRootNode() override = default; ENodeType NodeType() override { diff --git a/src/Core/Scene/CScriptAttachNode.h b/src/Core/Scene/CScriptAttachNode.h index ad23b404..c63bf0d3 100644 --- a/src/Core/Scene/CScriptAttachNode.h +++ b/src/Core/Scene/CScriptAttachNode.h @@ -37,7 +37,7 @@ public: TString LocatorName() const { return mLocatorName; } protected: - void CalculateTransform(CTransform4f& rOut) const; + void CalculateTransform(CTransform4f& rOut) const override; }; #endif // CSCRIPTATTACHNODE_H diff --git a/src/Core/Scene/CScriptNode.h b/src/Core/Scene/CScriptNode.h index 43c99dc1..92f277b4 100644 --- a/src/Core/Scene/CScriptNode.h +++ b/src/Core/Scene/CScriptNode.h @@ -78,7 +78,7 @@ public: protected: void SetDisplayAsset(CResource *pRes); - void CalculateTransform(CTransform4f& rOut) const; + void CalculateTransform(CTransform4f& rOut) const override; }; #endif // CSCRIPTNODE_H diff --git a/src/Core/ScriptExtra/CSandwormExtra.h b/src/Core/ScriptExtra/CSandwormExtra.h index ca6e1776..6203c1be 100644 --- a/src/Core/ScriptExtra/CSandwormExtra.h +++ b/src/Core/ScriptExtra/CSandwormExtra.h @@ -10,7 +10,7 @@ class CSandwormExtra : public CScriptExtra public: explicit CSandwormExtra(CScriptObject* pInstance, CScene* pScene, CScriptNode* pParent); - void PropertyModified(IProperty* pProp); + void PropertyModified(IProperty* pProp) override; }; #endif // CSANDWORMEXTRA_H diff --git a/src/Core/ScriptExtra/CScriptExtra.h b/src/Core/ScriptExtra/CScriptExtra.h index a24a94b5..1a1d7b78 100644 --- a/src/Core/ScriptExtra/CScriptExtra.h +++ b/src/Core/ScriptExtra/CScriptExtra.h @@ -34,7 +34,7 @@ public: { } - virtual ~CScriptExtra() = default; + ~CScriptExtra() override = default; CScriptObject* Instance() const { return mpInstance; } EGame Game() const { return mGame; } @@ -51,7 +51,7 @@ public: // Virtual CScriptExtra functions virtual void InstanceTransformed() {} - virtual void PropertyModified(IProperty* /*pProperty*/) {} + void PropertyModified(IProperty* /*pProperty*/) override {} virtual void DisplayAssetChanged(CResource* /*pNewDisplayAsset*/) {} virtual void LinksModified() {} virtual bool ShouldDrawNormalAssets() { return true; } diff --git a/src/Core/ScriptExtra/CWaypointExtra.h b/src/Core/ScriptExtra/CWaypointExtra.h index 734cad5a..0d75e2c3 100644 --- a/src/Core/ScriptExtra/CWaypointExtra.h +++ b/src/Core/ScriptExtra/CWaypointExtra.h @@ -21,7 +21,7 @@ class CWaypointExtra : public CScriptExtra public: explicit CWaypointExtra(CScriptObject *pInstance, CScene *pScene, CScriptNode *pParent = nullptr); - ~CWaypointExtra(); + ~CWaypointExtra() override; void CheckColor(); void AddToSplinePath(CSplinePathExtra *pPath); void RemoveFromSplinePath(const CSplinePathExtra *pPath); @@ -29,11 +29,11 @@ public: bool IsPathLink(const CLink *pLink) const; void GetLinkedWaypoints(std::list& rOut); - void OnTransformed(); - void LinksModified(); - void AddToRenderer(CRenderer *pRenderer, const SViewInfo& rkViewInfo); - void Draw(FRenderOptions Options, int ComponentIndex, ERenderCommand Command, const SViewInfo& rkViewInfo); - CColor TevColor(); + void OnTransformed() override; + void LinksModified() override; + void AddToRenderer(CRenderer *pRenderer, const SViewInfo& rkViewInfo) override; + void Draw(FRenderOptions Options, int ComponentIndex, ERenderCommand Command, const SViewInfo& rkViewInfo) override; + CColor TevColor() override; }; #endif // CWAYPOINTEXTRA_H