Core/AI: Build fix

- Stop exposing DoublePosition constructor versions, they're only used for internal representation
- Moved IsInBounds function to public scope

(cherry picked from commit 83162fafa453c1d34fe23ddd86a43c3dff058300)

2 files changed, 1 insertions, 16 deletions

diff --git a/src/server/game/Maps/AreaBoundary.cpp b/src/server/game/Maps/AreaBoundary.cpp
index af5e6ffe734..407b5c27e53 100644
--- a/src/server/game/Maps/AreaBoundary.cpp
+++ b/src/server/game/Maps/AreaBoundary.cpp
@@ -38,13 +38,9 @@ bool RectangleBoundary::IsWithinBoundaryArea(Position const* pos) const
 
 // ---== CIRCLE ==---
 CircleBoundary::CircleBoundary(Position const& center, double radius, bool isInverted) :
-    CircleBoundary(DoublePosition(center), radius, isInverted) { }
-CircleBoundary::CircleBoundary(DoublePosition const& center, double radius, bool isInverted) :
     AreaBoundary(isInverted), _center(center), _radiusSq(radius*radius) { }
 CircleBoundary::CircleBoundary(Position const& center, Position const& pointOnCircle, bool isInverted) :
-    CircleBoundary(DoublePosition(center), DoublePosition(pointOnCircle), isInverted) { }
-CircleBoundary::CircleBoundary(DoublePosition const& center, DoublePosition const& pointOnCircle, bool isInverted) :
-    AreaBoundary(isInverted), _center(center), _radiusSq(center.GetDoubleExactDist2dSq(pointOnCircle)) { }
+    AreaBoundary(isInverted), _center(center), _radiusSq(_center.GetDoubleExactDist2dSq(pointOnCircle)) { }
 bool CircleBoundary::IsWithinBoundaryArea(Position const* pos) const
 {
     if (!pos)
@@ -58,8 +54,6 @@ bool CircleBoundary::IsWithinBoundaryArea(Position const* pos) const
 
 // ---== ELLIPSE ==---
 EllipseBoundary::EllipseBoundary(Position const& center, double radiusX, double radiusY, bool isInverted) :
-    EllipseBoundary(DoublePosition(center), radiusX, radiusY, isInverted) { }
-EllipseBoundary::EllipseBoundary(DoublePosition const& center, double radiusX, double radiusY, bool isInverted) :
     AreaBoundary(isInverted), _center(center), _radiusYSq(radiusY*radiusY), _scaleXSq(_radiusYSq / (radiusX*radiusX)) { }
 bool EllipseBoundary::IsWithinBoundaryArea(Position const* pos) const
 {
@@ -73,8 +67,6 @@ bool EllipseBoundary::IsWithinBoundaryArea(Position const* pos) const
 
 // ---== TRIANGLE ==---
 TriangleBoundary::TriangleBoundary(Position const& pointA, Position const& pointB, Position const& pointC, bool isInverted) :
-    TriangleBoundary(DoublePosition(pointA), DoublePosition(pointB), DoublePosition(pointC), isInverted) { }
-TriangleBoundary::TriangleBoundary(DoublePosition const& pointA, DoublePosition const& pointB, DoublePosition const& pointC, bool isInverted) :
     AreaBoundary(isInverted), _a(pointA), _b(pointB), _c(pointC), _abx(_b.GetDoublePositionX()-_a.GetDoublePositionX()), _bcx(_c.GetDoublePositionX()-_b.GetDoublePositionX()), _cax(_a.GetDoublePositionX() - _c.GetDoublePositionX()), _aby(_b.GetDoublePositionY()-_a.GetDoublePositionY()), _bcy(_c.GetDoublePositionY()-_b.GetDoublePositionY()), _cay(_a.GetDoublePositionY() - _c.GetDoublePositionY()) { }
 bool TriangleBoundary::IsWithinBoundaryArea(Position const* pos) const
 {
@@ -93,8 +85,6 @@ bool TriangleBoundary::IsWithinBoundaryArea(Position const* pos) const
 
 // ---== PARALLELOGRAM ==---
 ParallelogramBoundary::ParallelogramBoundary(Position const& cornerA, Position const& cornerB, Position const& cornerD, bool isInverted) :
-    ParallelogramBoundary(DoublePosition(cornerA), DoublePosition(cornerB), DoublePosition(cornerD), isInverted) { }
-ParallelogramBoundary::ParallelogramBoundary(DoublePosition const& cornerA, DoublePosition const& cornerB, DoublePosition const& cornerD, bool isInverted) :
     AreaBoundary(isInverted), _a(cornerA), _b(cornerB), _d(cornerD), _c(DoublePosition(_d.GetDoublePositionX() + (_b.GetDoublePositionX() - _a.GetDoublePositionX()), _d.GetDoublePositionY() + (_b.GetDoublePositionY() - _a.GetDoublePositionY()))), _abx(_b.GetDoublePositionX() - _a.GetDoublePositionX()), _dax(_a.GetDoublePositionX() - _d.GetDoublePositionX()), _aby(_b.GetDoublePositionY() - _a.GetDoublePositionY()), _day(_a.GetDoublePositionY() - _d.GetDoublePositionY()) { }
 bool ParallelogramBoundary::IsWithinBoundaryArea(Position const* pos) const
 {
diff --git a/src/server/game/Maps/AreaBoundary.h b/src/server/game/Maps/AreaBoundary.h
index b2fdc49a7a6..6aa7e4185cc 100644
--- a/src/server/game/Maps/AreaBoundary.h
+++ b/src/server/game/Maps/AreaBoundary.h
@@ -88,9 +88,7 @@ class TC_GAME_API CircleBoundary : public AreaBoundary
 {
     public:
         CircleBoundary(Position const& center, double radius, bool isInverted = false);
-        CircleBoundary(DoublePosition const& center, double radius, bool isInverted = false);
         CircleBoundary(Position const& center, Position const& pointOnCircle, bool isInverted = false);
-        CircleBoundary(DoublePosition const& center, DoublePosition const& pointOnCircle, bool isInverted = false);
 
     protected:
         bool IsWithinBoundaryArea(Position const* pos) const override;
@@ -104,7 +102,6 @@ class TC_GAME_API EllipseBoundary : public AreaBoundary
 {
     public:
         EllipseBoundary(Position const& center, double radiusX, double radiusY, bool isInverted = false);
-        EllipseBoundary(DoublePosition const& center, double radiusX, double radiusY, bool isInverted = false);
 
     protected:
         bool IsWithinBoundaryArea(Position const* pos) const override;
@@ -118,7 +115,6 @@ class TC_GAME_API TriangleBoundary : public AreaBoundary
 {
     public:
         TriangleBoundary(Position const& pointA, Position const& pointB, Position const& pointC, bool isInverted = false);
-        TriangleBoundary(DoublePosition const& pointA, DoublePosition const& pointB, DoublePosition const& pointC, bool isInverted = false);
 
     protected:
         bool IsWithinBoundaryArea(Position const* pos) const override;
@@ -133,7 +129,6 @@ class TC_GAME_API ParallelogramBoundary : public AreaBoundary
     public:
         // Note: AB must be orthogonal to AD
         ParallelogramBoundary(Position const& cornerA, Position const& cornerB, Position const& cornerD, bool isInverted = false);
-        ParallelogramBoundary(DoublePosition const& cornerA, DoublePosition const& cornerB, DoublePosition const& cornerD, bool isInverted = false);
 
     protected:
         bool IsWithinBoundaryArea(Position const* pos) const override;