fix build with --enable-debug

atupone · Oct 17, 2024 · 8939b04 · 8939b04
1 parent b0d4b48
commit 8939b04
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/src/bzflag/playing.cxx b/src/bzflag/playing.cxx
@@ -6276,7 +6276,7 @@ void drawFrame(const float dt)
             viewFrustum.setView(eyePoint, targetPoint);
 
             // draw rear channel
-            sceneRenderer->render(true, true, true);
+            sceneRenderer->render(true, true);
 #endif
             // back to center channel
             mainWindow->setQuadrant(MainWindow::UpperRight);

diff --git a/src/geometry/BoltSceneNode.cxx b/src/geometry/BoltSceneNode.cxx
@@ -597,25 +597,30 @@ void BoltSceneNode::BoltRenderNode::renderGeoPill(
     GeoPillVBOs &geoPill)
 {
     float lenMinusRads = len - 2 * radius;
+    int segments;
 
     if (radius > 0)
     {
         glPushMatrix();
         glScalef(radius, radius, radius);
         // 4 parts of the first hemisphere
         geoPill.emi1st1.draw(GL_TRIANGLE_STRIP);
+        segments = (geoPill.emi1st1.indexSize / 2 - 1);
         addTriangleCount(segments);
         glTranslatef(0, 0, 0.1f);
 
         geoPill.emi1st2.draw(GL_TRIANGLE_STRIP);
+        segments = (geoPill.emi1st2.indexSize / 2 - 1);
         addTriangleCount(segments);
         glTranslatef(0, 0, 0.15f);
 
         geoPill.emi1st3.draw(GL_TRIANGLE_STRIP);
+        segments = (geoPill.emi1st3.indexSize / 2 - 1);
         addTriangleCount(segments);
         glTranslatef(0, 0, 0.25f);
 
         geoPill.emi1st4.draw(GL_TRIANGLE_STRIP);
+        segments = (geoPill.emi1st4.indexSize / 2 - 1);
         addTriangleCount(segments);
         glTranslatef(0, 0, 0.5f);
         glPopMatrix();
@@ -629,6 +634,7 @@ void BoltSceneNode::BoltRenderNode::renderGeoPill(
         glScalef(radius, radius, lenMinusRads);
         geoPill.shaft.draw(GL_TRIANGLE_STRIP);
         glPopMatrix();
+        segments = (geoPill.shaft.indexSize / 2 - 1);
         addTriangleCount(segments);
         glTranslatef(0,0,lenMinusRads);
     }
@@ -638,20 +644,27 @@ void BoltSceneNode::BoltRenderNode::renderGeoPill(
         // 4 parts of the last hemisphere
         glScalef(radius, radius, radius);
         geoPill.emi2nd4.draw(GL_TRIANGLE_STRIP);
+        segments = (geoPill.emi2nd4.indexSize / 2 - 1);
         addTriangleCount(segments);
         glTranslatef(0,0,0.5f);
 
         geoPill.emi2nd3.draw(GL_TRIANGLE_STRIP);
+        segments = (geoPill.emi2nd3.indexSize / 2 - 1);
         addTriangleCount(segments);
         glTranslatef(0,0,0.25f);
 
         geoPill.emi2nd2.draw(GL_TRIANGLE_STRIP);
+        segments = (geoPill.emi2nd2.indexSize / 2 - 1);
         addTriangleCount(segments);
         glTranslatef(0,0,0.15f);
 
         geoPill.emi2nd1.draw(GL_TRIANGLE_STRIP);
+        segments = (geoPill.emi2nd1.indexSize / 2 - 1);
         addTriangleCount(segments);
     }
+    // Without DEBUG this variable is not used
+    // the next line drop the warning
+    (void)segments;
 }
 
 void            BoltSceneNode::BoltRenderNode::render()

diff --git a/src/geometry/FlagSceneNode.cxx b/src/geometry/FlagSceneNode.cxx
@@ -481,7 +481,7 @@ void            FlagSceneNode::FlagRenderNode::render(bool shadow)
         }
         if (is_billboard && realFlag)
         {
-            pole3D.draw(GL_TRIANGLE_STRIP)
+            pole3D.draw(GL_TRIANGLE_STRIP);
             addTriangleCount(8);
         }
         else

diff --git a/src/geometry/MeshPolySceneNode.cxx b/src/geometry/MeshPolySceneNode.cxx
@@ -99,8 +99,9 @@ MeshPolySceneNode::MeshPolySceneNode(const glm::vec4 &_plane,
                                      const std::vector<glm::vec2> &texcoords) :
     node(this, vertices, normals, texcoords, plane)
 {
-    int i, j;
-    const int count = vertices.size();
+    unsigned int i;
+    int j;
+    const unsigned int count = vertices.size();
     assert(texcoords.size() == count);
     assert((normals.empty()) || (normals.size() == count));