clang16 warnings

BZFlag-Dev · Dec 15, 2023 · 1eb20f4 · 1eb20f4
1 parent c3840a5
commit 1eb20f4
Show file tree

Hide file tree

Showing 29 changed files with 63 additions and 65 deletions.
diff --git a/include/BillboardSceneNode.h b/include/BillboardSceneNode.h
@@ -67,7 +67,7 @@ class BillboardSceneNode : public SceneNode
         BillboardRenderNode(const BillboardSceneNode*);
         ~BillboardRenderNode();
         void        setColor(const GLfloat* rgba);
-        void        render();
+        void        render() override;
         const GLfloat* getPosition() const override;
         void        setFrame(float u, float v);
         void        setFrameSize(float du, float dv);

diff --git a/include/BoltSceneNode.h b/include/BoltSceneNode.h
@@ -66,7 +66,7 @@ class BoltSceneNode : public SceneNode
         ~BoltRenderNode();
         void        setColor(const GLfloat* rgba);
         void        setTextureColor(const GLfloat* rgba);
-        void        render();
+        void        render() override;
         const GLfloat* getPosition() const override;
         void        setAnimation(int cu, int cv);
 

diff --git a/include/EighthDBaseSceneNode.h b/include/EighthDBaseSceneNode.h
@@ -37,7 +37,7 @@ class EighthDBaseSceneNode : public EighthDimSceneNode
                               const float pos[3],
                               const float size[3], float rotation);
         ~EighthDBaseRenderNode();
-        void        render();
+        void        render() override;
         const GLfloat* getPosition() const override;
     private:
         const EighthDBaseSceneNode *sceneNode;

diff --git a/include/EighthDBoxSceneNode.h b/include/EighthDBoxSceneNode.h
@@ -39,7 +39,7 @@ class EighthDBoxSceneNode : public EighthDimSceneNode
                              const float pos[3],
                              const float size[3], float rotation);
         ~EighthDBoxRenderNode();
-        void        render();
+        void        render() override;
         const GLfloat* getPosition() const override;
     private:
         const EighthDBoxSceneNode* sceneNode;

diff --git a/include/EighthDPyrSceneNode.h b/include/EighthDPyrSceneNode.h
@@ -39,7 +39,7 @@ class EighthDPyrSceneNode : public EighthDimSceneNode
                              const float pos[3],
                              const float size[3], float rotation);
         ~EighthDPyrRenderNode();
-        void        render();
+        void        render() override;
         const GLfloat* getPosition() const override;
     private:
         const EighthDPyrSceneNode* sceneNode;

diff --git a/include/EighthDimSceneNode.h b/include/EighthDimSceneNode.h
@@ -42,7 +42,7 @@ class EighthDimSceneNode : public SceneNode
             const EighthDimSceneNode*,
             int numPolygons);
         ~EighthDimRenderNode();
-        void        render();
+        void        render() override;
         void        setPolygon(int index, const GLfloat[3][3]);
         const GLfloat* getPosition() const override;
     private:

diff --git a/include/EighthDimShellNode.h b/include/EighthDimShellNode.h
@@ -40,8 +40,8 @@ class EighthDimShellNode : public SceneNode
         ShellRenderNode(RenderNode *renderNode,
                         const OpenGLGState* gstate);
         ~ShellRenderNode();
-        void render();
-        void renderShadow()
+        void render() override;
+        void renderShadow() override
         {
             return;
         }

diff --git a/include/FlagWarpSceneNode.h b/include/FlagWarpSceneNode.h
@@ -41,7 +41,7 @@ class FlagWarpSceneNode : public SceneNode
     public:
         FlagWarpRenderNode(const FlagWarpSceneNode*);
         ~FlagWarpRenderNode();
-        void        render();
+        void        render() override;
         const GLfloat* getPosition() const override;
     private:
         const FlagWarpSceneNode* sceneNode;

diff --git a/include/LaserSceneNode.h b/include/LaserSceneNode.h
@@ -17,7 +17,7 @@
 #ifndef BZF_LASER_SCENE_NODE_H
 #define BZF_LASER_SCENE_NODE_H
 
-#include "common.h"
+// Inherits from
 #include "SceneNode.h"
 
 class LaserSceneNode : public SceneNode
@@ -47,7 +47,7 @@ class LaserSceneNode : public SceneNode
     public:
         LaserRenderNode(const LaserSceneNode*);
         ~LaserRenderNode();
-        void        render();
+        void        render() override;
         const GLfloat* getPosition() const override;
     private:
         void renderFlatLaser();

diff --git a/include/MeshPolySceneNode.h b/include/MeshPolySceneNode.h
@@ -60,8 +60,8 @@ class MeshPolySceneNode : public WallSceneNode
         {
             style = _style;
         }
-        void render();
-        void renderShadow();
+        void render() override;
+        void renderShadow() override;
         const GLfloat* getVertex(int i) const;
         const GLfloat (*getVertices() const)[3];
         int getVertexCount() const;

diff --git a/include/PolyWallSceneNode.h b/include/PolyWallSceneNode.h
@@ -49,7 +49,7 @@ class PolyWallSceneNode : public WallSceneNode
         {
             style = _style;
         }
-        void        render();
+        void        render() override;
         const GLfloat* getPosition() const override;
     private:
         void        drawV() const;

diff --git a/include/QuadWallSceneNode.h b/include/QuadWallSceneNode.h
@@ -82,8 +82,8 @@ class QuadWallSceneNode : public WallSceneNode
         {
             style = _style;
         }
-        void        render();
-        void        renderShadow();
+        void        render() override;
+        void        renderShadow() override;
         const GLfloat*  getVertex(int i) const;
         const GLfloat* getPosition() const override;
     private:

diff --git a/include/SphereSceneNode.h b/include/SphereSceneNode.h
@@ -86,7 +86,7 @@ class SphereLodSceneNode : public SphereSceneNode
         SphereLodRenderNode(const SphereLodSceneNode*);
         ~SphereLodRenderNode();
         void setLod(int lod);
-        void render();
+        void render() override;
         const GLfloat* getPosition() const override;
 
     private:
@@ -144,7 +144,7 @@ class SphereFragmentSceneNode : public SceneNode
                            int theta, int phi);
         ~FragmentRenderNode();
         const GLfloat*  getVertex() const;
-        void        render();
+        void        render() override;
         const GLfloat*  getPosition() const override;
     private:
         const SphereBspSceneNode*   sceneNode;
@@ -190,7 +190,7 @@ class SphereBspSceneNode : public SphereSceneNode
         ~SphereBspRenderNode();
         void        setHighResolution(bool);
         void        setBaseIndex(int index);
-        void        render();
+        void        render() override;
         const GLfloat* getPosition() const override;
     private:
         const SphereBspSceneNode* sceneNode;

diff --git a/include/TankSceneNode.h b/include/TankSceneNode.h
@@ -17,8 +17,10 @@
 #ifndef BZF_TANK_SCENE_NODE_H
 #define BZF_TANK_SCENE_NODE_H
 
-#include "common.h"
+// Inherits from
 #include "SceneNode.h"
+
+// Common headers
 #include "OpenGLLight.h"
 #include "TankGeometryMgr.h"
 
@@ -79,7 +81,7 @@ class TankIDLSceneNode : public SceneNode
     public:
         IDLRenderNode(const TankIDLSceneNode*);
         ~IDLRenderNode();
-        void        render();
+        void        render() override;
         const GLfloat* getPosition() const override;
     private:
         const TankIDLSceneNode* sceneNode;
@@ -171,7 +173,7 @@ class TankSceneNode : public SceneNode
         void        setNarrowWithDepth(bool narrow);
         const GLfloat* getPosition() const override;
 
-        void        render();
+        void        render() override;
         void        renderPart(TankGeometryEnums::TankPart part);
         void        renderParts();
         void        renderTopParts();

diff --git a/include/TriWallSceneNode.h b/include/TriWallSceneNode.h
@@ -62,8 +62,8 @@ class TriWallSceneNode : public WallSceneNode
         {
             style = _style;
         }
-        void        render();
-        void        renderShadow();
+        void        render() override;
+        void        renderShadow() override;
         const GLfloat*  getVertex(int i) const;
         const GLfloat* getPosition() const override;
     private:

diff --git a/src/bzflag/TrackMarks.cxx b/src/bzflag/TrackMarks.cxx
@@ -150,8 +150,8 @@ class TrackRenderNode : public RenderNode
 public:
     TrackRenderNode(const TrackEntry* te, TrackType type);
     ~TrackRenderNode();
-    void render();
-    void renderShadow()
+    void render() override;
+    void renderShadow() override
     {
         return;
     }

diff --git a/src/bzfs/CustomArc.h b/src/bzfs/CustomArc.h
@@ -16,19 +16,19 @@
 /* interface header */
 #include "WorldFileObstacle.h"
 
-/* local interface headers */
-#include "WorldInfo.h"
-
 /* common interface headers */
 #include "BzMaterial.h"
 
+/* local interface headers */
+#include "WorldInfo.h"
+
 
 class CustomArc : public WorldFileObstacle
 {
 public:
     CustomArc(bool boxStyle);
     ~CustomArc();
-    virtual bool read(const char* cmd, std::istream& input);
+    bool read(const char* cmd, std::istream& input) override;
     void writeToGroupDef(GroupDefinition*) override;
 
 private:

diff --git a/src/bzfs/CustomBase.h b/src/bzfs/CustomBase.h
@@ -13,8 +13,6 @@
 #ifndef __CUSTOMBASE_H__
 #define __CUSTOMBASE_H__
 
-#include "common.h"
-
 /* interface header */
 #include "WorldFileObstacle.h"
 
@@ -29,7 +27,7 @@ class CustomBase : public WorldFileObstacle
 {
 public:
     CustomBase();
-    virtual bool read(const char *cmd, std::istream&);
+    bool read(const char *cmd, std::istream&) override;
     void writeToGroupDef(GroupDefinition*) override;
 
 protected:

diff --git a/src/bzfs/CustomBox.h b/src/bzfs/CustomBox.h
@@ -16,19 +16,19 @@
 /* interface header */
 #include "WorldFileObstacle.h"
 
-/* local interface headers */
-#include "WorldInfo.h"
-
 /* common interface headers */
 #include "BzMaterial.h"
 
+/* local interface headers */
+#include "WorldInfo.h"
+
 
 class CustomBox : public WorldFileObstacle
 {
 public:
     CustomBox();
     ~CustomBox();
-    virtual bool read(const char* cmd, std::istream& input);
+    bool read(const char* cmd, std::istream& input) override;
     void writeToGroupDef(GroupDefinition*) override;
 
 private:

diff --git a/src/bzfs/CustomCone.h b/src/bzfs/CustomCone.h
@@ -16,19 +16,19 @@
 /* interface header */
 #include "WorldFileObstacle.h"
 
-/* local interface headers */
-#include "WorldInfo.h"
-
 /* common interface headers */
 #include "BzMaterial.h"
 
+/* local interface headers */
+#include "WorldInfo.h"
+
 
 class CustomCone : public WorldFileObstacle
 {
 public:
     CustomCone(bool pyramidStyle);
     ~CustomCone();
-    virtual bool read(const char* cmd, std::istream& input);
+    bool read(const char* cmd, std::istream& input) override;
     void writeToGroupDef(GroupDefinition*) override;
 
 private:

diff --git a/src/bzfs/CustomGate.h b/src/bzfs/CustomGate.h
@@ -13,8 +13,6 @@
 #ifndef __CUSTOMGATE_H__
 #define __CUSTOMGATE_H__
 
-#include "common.h"
-
 /* interface header */
 #include "WorldFileObstacle.h"
 
@@ -30,7 +28,7 @@ class CustomGate : public WorldFileObstacle
 {
 public:
     CustomGate(const char* telename);
-    virtual bool read(const char *cmd, std::istream&);
+    bool read(const char *cmd, std::istream&) override;
     void writeToGroupDef(GroupDefinition*) override;
 
 protected:

diff --git a/src/bzfs/CustomGroup.h b/src/bzfs/CustomGroup.h
@@ -13,7 +13,8 @@
 #ifndef __CUSTOM_GROUP_H__
 #define __CUSTOM_GROUP_H__
 
-#include "common.h"
+// Inherits from
+#include "WorldFileObstacle.h"
 
 /* system interface headers */
 #include <string>
@@ -22,7 +23,6 @@
 
 /* local interface headers */
 #include "WorldInfo.h"
-#include "WorldFileObstacle.h"
 
 class GroupInstance;
 
@@ -31,7 +31,7 @@ class CustomGroup : public WorldFileObstacle
 public:
     CustomGroup(const std::string& groupdef);
     ~CustomGroup();
-    virtual bool read(const char *cmd, std::istream&);
+    bool read(const char *cmd, std::istream&) override;
     void writeToGroupDef(GroupDefinition*) override;
 
 protected:

diff --git a/src/bzfs/CustomMesh.h b/src/bzfs/CustomMesh.h
@@ -34,7 +34,7 @@ class CustomMesh : public WorldFileObstacle
 public:
     CustomMesh();
     ~CustomMesh();
-    virtual bool read(const char *cmd, std::istream& input);
+    bool read(const char *cmd, std::istream& input) override;
     void writeToGroupDef(GroupDefinition*) override;
 
 private:

diff --git a/src/bzfs/CustomPyramid.h b/src/bzfs/CustomPyramid.h
@@ -16,19 +16,19 @@
 /* interface header */
 #include "WorldFileObstacle.h"
 
-/* local interface headers */
-#include "WorldInfo.h"
-
 /* common interface headers */
 #include "BzMaterial.h"
 
+/* local interface headers */
+#include "WorldInfo.h"
+
 
 class CustomPyramid : public WorldFileObstacle
 {
 public:
     CustomPyramid();
     ~CustomPyramid();
-    virtual bool read(const char* cmd, std::istream& input);
+    bool read(const char* cmd, std::istream& input) override;
     void writeToGroupDef(GroupDefinition*) override;
 
 private:

diff --git a/src/bzfs/CustomSphere.h b/src/bzfs/CustomSphere.h
@@ -16,19 +16,19 @@
 /* interface header */
 #include "WorldFileObstacle.h"
 
-/* local interface headers */
-#include "WorldInfo.h"
-
 /* common interface headers */
 #include "BzMaterial.h"
 
+/* local interface headers */
+#include "WorldInfo.h"
+
 
 class CustomSphere : public WorldFileObstacle
 {
 public:
     CustomSphere();
     ~CustomSphere();
-    virtual bool read(const char *cmd, std::istream& input);
+    bool read(const char *cmd, std::istream& input) override;
     void writeToGroupDef(GroupDefinition*) override;
 
 private: