Move addWall out of WorldInfo. Fixes #341.

BZFlag-Dev · Dec 9, 2024 · 6089084 · 6089084
1 parent 2e52264
commit 6089084
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/src/bzfs/WorldInfo.cxx b/src/bzfs/WorldInfo.cxx
@@ -39,7 +39,6 @@
 #include "BaseBuilding.h"
 #include "TetraBuilding.h"
 #include "Teleporter.h"
-#include "WallObstacle.h"
 #include "MeshObstacle.h"
 #include "ArcObstacle.h"
 #include "ConeObstacle.h"
@@ -76,15 +75,6 @@ WorldInfo::~WorldInfo()
     finished = false;
 }
 
-
-void WorldInfo::addWall(float x, float y, float z, float r, float w, float h)
-{
-    const float pos[3] = {x, y, z};
-    WallObstacle* wall = new WallObstacle(pos, r, w, h, false);
-    OBSTACLEMGR.addWorldObstacle(wall);
-}
-
-
 void WorldInfo::addLink(int src, int dst)
 {
     links.addLink(src, dst);

diff --git a/src/bzfs/bzfs.cxx b/src/bzfs/bzfs.cxx
@@ -55,6 +55,7 @@
 // common implementation headers
 #include "Obstacle.h"
 #include "ObstacleMgr.h"
+#include "WallObstacle.h"
 #include "CollisionManager.h"
 #include "BaseBuilding.h"
 #include "AnsiCodes.h"
@@ -1050,6 +1051,13 @@ static void relayPlayerPacket(int index, uint16_t len, const void *rawbuf, uint1
     }
 }
 
+void addWall(float x, float y, float z, float r, float w, float h)
+{
+    const float pos[3] = { x, y, z };
+    WallObstacle* wall = new WallObstacle(pos, r, w, h, false);
+    OBSTACLEMGR.addWorldObstacle(wall);
+}
+
 void makeWalls ( void )
 {
     float worldSize = BZDBCache::worldSize;
@@ -1079,16 +1087,16 @@ void makeWalls ( void )
             float x = sinf(midpointAngle*degToRad)*midpointRad;
             float y = cosf(midpointAngle*degToRad)*midpointRad;
 
-            world->addWall(x, y, 0.0f, (270.0f-midpointAngle)*degToRad, (float)segmentLen, wallHeight);
+            addWall(x, y, 0.0f, (270.0f-midpointAngle)*degToRad, (float)segmentLen, wallHeight);
 
         }
     }
     else
     {
-        world->addWall(0.0f, 0.5f * worldSize, 0.0f, (float)(1.5 * M_PI), 0.5f * worldSize, wallHeight);
-        world->addWall(0.5f * worldSize, 0.0f, 0.0f, (float)M_PI, 0.5f * worldSize, wallHeight);
-        world->addWall(0.0f, -0.5f * worldSize, 0.0f, (float)(0.5 * M_PI), 0.5f * worldSize, wallHeight);
-        world->addWall(-0.5f * worldSize, 0.0f, 0.0f, 0.0f, 0.5f * worldSize, wallHeight);
+        addWall(0.0f, 0.5f * worldSize, 0.0f, (float)(1.5 * M_PI), 0.5f * worldSize, wallHeight);
+        addWall(0.5f * worldSize, 0.0f, 0.0f, (float)M_PI, 0.5f * worldSize, wallHeight);
+        addWall(0.0f, -0.5f * worldSize, 0.0f, (float)(0.5 * M_PI), 0.5f * worldSize, wallHeight);
+        addWall(-0.5f * worldSize, 0.0f, 0.0f, 0.0f, 0.5f * worldSize, wallHeight);
     }
 }