Skip to content

refactor: Add override keyword to virtual function overrides in Libraries #2390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 7 commits into from
Mar 26, 2026
Merged

refactor: Add override keyword to virtual function overrides in Libraries #2390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7bd77f0
refactor(GeneralsMD): Add override keyword to virtual function overri…
bobtista Mar 3, 2026
61bce4e
refactor(Generals): Add override keyword to virtual function override…
bobtista Mar 3, 2026
1a679a0
refactor(Core): Add override keyword to virtual function overrides in…
bobtista Mar 3, 2026
06c9db7
bugfix: Add missing virtual keyword to override method declarations i…
bobtista Mar 11, 2026
5919d77
bugfix: Remove incorrectly added virtual from PointSize data member i…
bobtista Mar 11, 2026
e9fe36a
Fix override spacing in dynamesh.h and add override to commented-out …
bobtista Mar 24, 2026
68d00d4
fix: Add missing virtual keyword to destructor overrides
bobtista Mar 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WW3D2/aabtree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class AABTreeClass : public W3DMPO, public RefCountClass
AABTreeClass();
AABTreeClass(AABTreeBuilderClass * builder);
AABTreeClass(const AABTreeClass & that);
~AABTreeClass();
virtual ~AABTreeClass() override;

void Load_W3D(ChunkLoadClass & cload);

Expand Down
14 changes: 7 additions & 7 deletions Core/Libraries/Source/WWVegas/WW3D2/agg_def.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,15 +209,15 @@ class AggregatePrototypeClass : public W3DMPO, public PrototypeClass
//
// Public methods
//
virtual const char * Get_Name() const { return m_pDefinition->Get_Name (); }
virtual int Get_Class_ID() const { return m_pDefinition->Class_ID (); }
virtual RenderObjClass * Create () { return m_pDefinition->Create (); }
virtual void DeleteSelf() { delete this; }
virtual const char * Get_Name() const override { return m_pDefinition->Get_Name (); }
virtual int Get_Class_ID() const override { return m_pDefinition->Class_ID (); }
virtual RenderObjClass * Create () override { return m_pDefinition->Create (); }
virtual void DeleteSelf() override { delete this; }
virtual AggregateDefClass * Get_Definition () const { return m_pDefinition; }
virtual void Set_Definition (AggregateDefClass *pdef) { m_pDefinition = pdef; }

protected:
virtual ~AggregatePrototypeClass () { delete m_pDefinition; }
virtual ~AggregatePrototypeClass () override { delete m_pDefinition; }

private:

Expand All @@ -237,8 +237,8 @@ class AggregateLoaderClass : public PrototypeLoaderClass
{
public:

virtual int Chunk_Type () { return W3D_CHUNK_AGGREGATE; }
virtual PrototypeClass * Load_W3D (ChunkLoadClass &chunk_load);
virtual int Chunk_Type () override { return W3D_CHUNK_AGGREGATE; }
virtual PrototypeClass * Load_W3D (ChunkLoadClass &chunk_load) override;
};


Expand Down
4 changes: 2 additions & 2 deletions Core/Libraries/Source/WWVegas/WW3D2/bmp2d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ class Bitmap2DObjClass : public DynamicScreenMeshClass
bool center, bool additive, bool colorizable = false, bool ignore_alpha = false);
Bitmap2DObjClass( const Bitmap2DObjClass & src) : DynamicScreenMeshClass(src) {}

virtual RenderObjClass * Clone() const;
virtual int Class_ID() const { return CLASSID_BITMAP2D; }
virtual RenderObjClass * Clone() const override;
virtual int Class_ID() const override { return CLASSID_BITMAP2D; }
};
10 changes: 5 additions & 5 deletions Core/Libraries/Source/WWVegas/WW3D2/collect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,15 @@ class CollectionPrototypeClass : public W3DMPO, public PrototypeClass
public:
CollectionPrototypeClass(CollectionDefClass * def) { ColDef = def; WWASSERT(ColDef); }

virtual const char * Get_Name() const { return ColDef->Get_Name(); }
virtual int Get_Class_ID() const { return RenderObjClass::CLASSID_COLLECTION; }
virtual RenderObjClass * Create() { return NEW_REF( CollectionClass, (*ColDef)); }
virtual void DeleteSelf() { delete this; }
virtual const char * Get_Name() const override { return ColDef->Get_Name(); }
virtual int Get_Class_ID() const override { return RenderObjClass::CLASSID_COLLECTION; }
virtual RenderObjClass * Create() override { return NEW_REF( CollectionClass, (*ColDef)); }
virtual void DeleteSelf() override { delete this; }

CollectionDefClass * ColDef;

protected:
virtual ~CollectionPrototypeClass() { delete ColDef; }
virtual ~CollectionPrototypeClass() override { delete ColDef; }
};


Expand Down
52 changes: 26 additions & 26 deletions Core/Libraries/Source/WWVegas/WW3D2/collect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ class CollectionClass : public CompositeRenderObjClass
CollectionClass(const CollectionDefClass & def);
CollectionClass(const CollectionClass & src);
CollectionClass & operator = (const CollectionClass &);
virtual ~CollectionClass();
virtual RenderObjClass * Clone() const;
virtual ~CollectionClass() override;
virtual RenderObjClass * Clone() const override;

virtual int Class_ID() const;
virtual int Get_Num_Polys() const;
virtual int Class_ID() const override;
virtual int Get_Num_Polys() const override;

/////////////////////////////////////////////////////////////////////////////
// Proxy interface
Expand All @@ -75,48 +75,48 @@ class CollectionClass : public CompositeRenderObjClass
/////////////////////////////////////////////////////////////////////////////
// Render Object Interface - Rendering
/////////////////////////////////////////////////////////////////////////////
virtual void Render(RenderInfoClass & rinfo);
virtual void Special_Render(SpecialRenderInfoClass & rinfo);
virtual void Render(RenderInfoClass & rinfo) override;
virtual void Special_Render(SpecialRenderInfoClass & rinfo) override;

/////////////////////////////////////////////////////////////////////////////
// Render Object Interface - "Scene Graph"
/////////////////////////////////////////////////////////////////////////////
virtual void Set_Transform(const Matrix3D &m);
virtual void Set_Position(const Vector3 &v);
virtual int Get_Num_Sub_Objects() const;
virtual RenderObjClass * Get_Sub_Object(int index) const;
virtual int Add_Sub_Object(RenderObjClass * subobj);
virtual int Remove_Sub_Object(RenderObjClass * robj);
virtual void Set_Transform(const Matrix3D &m) override;
virtual void Set_Position(const Vector3 &v) override;
virtual int Get_Num_Sub_Objects() const override;
virtual RenderObjClass * Get_Sub_Object(int index) const override;
virtual int Add_Sub_Object(RenderObjClass * subobj) override;
virtual int Remove_Sub_Object(RenderObjClass * robj) override;

/////////////////////////////////////////////////////////////////////////////
// Render Object Interface - Collision Detection, Ray Tracing
/////////////////////////////////////////////////////////////////////////////
virtual bool Cast_Ray(RayCollisionTestClass & raytest);
virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest);
virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest);
virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest);
virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest);
virtual bool Cast_Ray(RayCollisionTestClass & raytest) override;
virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest) override;
virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest) override;
virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest) override;
virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest) override;

/////////////////////////////////////////////////////////////////////////////
// Render Object Interface - Bounding Volumes
/////////////////////////////////////////////////////////////////////////////
virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const;
virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const;
virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override;
virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override;


/////////////////////////////////////////////////////////////////////////////
// Render Object Interface - Attributes, Options, Properties, etc
/////////////////////////////////////////////////////////////////////////////
virtual int Snap_Point_Count();
virtual void Get_Snap_Point(int index,Vector3 * set);
virtual void Scale(float scale);
virtual void Scale(float scalex, float scaley, float scalez);
virtual void Update_Obj_Space_Bounding_Volumes();
virtual void Get_Snap_Point(int index,Vector3 * set) override;
virtual void Scale(float scale) override;
virtual void Scale(float scalex, float scaley, float scalez) override;
virtual void Update_Obj_Space_Bounding_Volumes() override;

protected:

void Free();
void Update_Sub_Object_Transforms();
virtual void Update_Sub_Object_Transforms() override;

DynamicVectorClass <ProxyClass> ProxyList;
DynamicVectorClass <RenderObjClass *> SubObjects;
Expand All @@ -135,8 +135,8 @@ class CollectionLoaderClass : public PrototypeLoaderClass
{
public:

virtual int Chunk_Type() { return W3D_CHUNK_COLLECTION; }
virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload);
virtual int Chunk_Type() override { return W3D_CHUNK_COLLECTION; }
virtual PrototypeClass * Load_W3D(ChunkLoadClass & cload) override;
};

extern CollectionLoaderClass _CollectionLoader;
40 changes: 20 additions & 20 deletions Core/Libraries/Source/WWVegas/WW3D2/composite.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,33 +52,33 @@ class CompositeRenderObjClass : public RenderObjClass

CompositeRenderObjClass();
CompositeRenderObjClass(const CompositeRenderObjClass & that);
virtual ~CompositeRenderObjClass();
virtual ~CompositeRenderObjClass() override;
CompositeRenderObjClass & operator = (const CompositeRenderObjClass & that);

virtual void Restart();
virtual void Restart() override;

virtual const char * Get_Name() const;
virtual void Set_Name(const char * name);
virtual const char * Get_Base_Model_Name () const;
virtual void Set_Base_Model_Name (const char *name);
virtual int Get_Num_Polys() const;
virtual void Notify_Added(SceneClass * scene);
virtual void Notify_Removed(SceneClass * scene);
virtual const char * Get_Name() const override;
virtual void Set_Name(const char * name) override;
virtual const char * Get_Base_Model_Name () const override;
virtual void Set_Base_Model_Name (const char *name) override;
virtual int Get_Num_Polys() const override;
virtual void Notify_Added(SceneClass * scene) override;
virtual void Notify_Removed(SceneClass * scene) override;

virtual bool Cast_Ray(RayCollisionTestClass & raytest);
virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest);
virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest);
virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest);
virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest);
virtual bool Cast_Ray(RayCollisionTestClass & raytest) override;
virtual bool Cast_AABox(AABoxCollisionTestClass & boxtest) override;
virtual bool Cast_OBBox(OBBoxCollisionTestClass & boxtest) override;
virtual bool Intersect_AABox(AABoxIntersectionTestClass & boxtest) override;
virtual bool Intersect_OBBox(OBBoxIntersectionTestClass & boxtest) override;

virtual void Create_Decal(DecalGeneratorClass * generator);
virtual void Delete_Decal(uint32 decal_id);
virtual void Create_Decal(DecalGeneratorClass * generator) override;
virtual void Delete_Decal(uint32 decal_id) override;

virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const { sphere = ObjSphere; }
virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const { box = ObjBox; }
virtual void Update_Obj_Space_Bounding_Volumes();
virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override { sphere = ObjSphere; }
virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override { box = ObjBox; }
virtual void Update_Obj_Space_Bounding_Volumes() override;

virtual void Set_User_Data(void *value, bool recursive = false);
virtual void Set_User_Data(void *value, bool recursive = false) override;

protected:

Expand Down
12 changes: 6 additions & 6 deletions Core/Libraries/Source/WWVegas/WW3D2/decalsys.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ class DecalGeneratorClass : public ProjectorClass
protected:

DecalGeneratorClass(uint32 id,DecalSystemClass * system);
~DecalGeneratorClass();
virtual ~DecalGeneratorClass() override;

/*
** Logical Decal ID, DecalSystem that this generator is tied to
Expand Down Expand Up @@ -215,19 +215,19 @@ class MultiFixedPoolDecalSystemClass : public DecalSystemClass

MultiFixedPoolDecalSystemClass(uint32 num_pools, const uint32 *pool_sizes);
MultiFixedPoolDecalSystemClass(const MultiFixedPoolDecalSystemClass & that);
virtual ~MultiFixedPoolDecalSystemClass();
virtual ~MultiFixedPoolDecalSystemClass() override;

// This clears the slot in addition to locking the generator, thus preventing any decal id
// collisions (since any decal previously in that slot will have the same id as the new one).
virtual DecalGeneratorClass * Lock_Decal_Generator();
virtual DecalGeneratorClass * Lock_Decal_Generator() override;

// This will register the decal in the system in the appropriate pool and slot (determined by
// the generator's pool and slot ids), removing any decal which may have been there before.
virtual void Unlock_Decal_Generator(DecalGeneratorClass * generator);
virtual void Unlock_Decal_Generator(DecalGeneratorClass * generator) override;

// This notifies the system that a mesh which has decals on it was destroyed - therefore we
// need to remove the mesh from our list to avoid dangling pointers.
virtual void Decal_Mesh_Destroyed(uint32 id,DecalMeshClass * mesh);
virtual void Decal_Mesh_Destroyed(uint32 id,DecalMeshClass * mesh) override;

// Not part of the DecalSystemClass interface - this function removes any decal currently in
// the given slot in the given pool.
Expand All @@ -247,7 +247,7 @@ class MultiFixedPoolDecalSystemClass : public DecalSystemClass
** can set them before calling Lock_Decal_Generator() (which is where this function is called).
** We do it this way to avoid needing to override Lock_Decal_Generator().
*/
virtual uint32 Generate_Decal_Id() { return encode_decal_id(Generator_PoolID, Generator_SlotID); }
virtual uint32 Generate_Decal_Id() override { return encode_decal_id(Generator_PoolID, Generator_SlotID); }
uint32 Generator_PoolID; // These should be set before calling Lock_Decal_Generator()
uint32 Generator_SlotID; // These should be set before calling Lock_Decal_Generator()

Expand Down
Loading
Loading