Maps/Boundary: Some code style clean-up in AreaBoundary code, as well as adding an additional utility overload to IsWithinBoundary (Position const&).

(cherry picked from commit a7afb476332b227dcb886a7ba727be7a226c37a4)

2 files changed, 16 insertions, 15 deletions

diff --git a/src/server/game/Maps/AreaBoundary.cpp b/src/server/game/Maps/AreaBoundary.cpp
index a87f0aa6a2d..b3803800d22 100644
--- a/src/server/game/Maps/AreaBoundary.cpp
+++ b/src/server/game/Maps/AreaBoundary.cpp
@@ -22,7 +22,7 @@
 // ---== RECTANGLE ==---
 RectangleBoundary::RectangleBoundary(float southX, float northX, float eastY, float westY, bool isInverted) :
     AreaBoundary(BoundaryType::BOUNDARY_RECTANGLE, isInverted), _minX(southX), _maxX(northX), _minY(eastY), _maxY(westY) { }
-bool RectangleBoundary::IsWithinBoundaryArea(const Position* pos) const
+bool RectangleBoundary::IsWithinBoundaryArea(Position const* pos) const
 {
     if (!pos)
         return false;
@@ -45,7 +45,7 @@ CircleBoundary::CircleBoundary(Position const& center, Position const& pointOnCi
     CircleBoundary(DoublePosition(center), DoublePosition(pointOnCircle), isInverted) { }
 CircleBoundary::CircleBoundary(DoublePosition const& center, DoublePosition const& pointOnCircle, bool isInverted) :
     AreaBoundary(BoundaryType::BOUNDARY_CIRCLE, isInverted), _center(center), _radiusSq(center.GetDoubleExactDist2dSq(pointOnCircle)) { }
-bool CircleBoundary::IsWithinBoundaryArea(const Position* pos) const
+bool CircleBoundary::IsWithinBoundaryArea(Position const* pos) const
 {
     if (!pos)
         return false;
@@ -61,7 +61,7 @@ EllipseBoundary::EllipseBoundary(Position const& center, double radiusX, double
     EllipseBoundary(DoublePosition(center), radiusX, radiusY, isInverted) { }
 EllipseBoundary::EllipseBoundary(DoublePosition const& center, double radiusX, double radiusY, bool isInverted) :
     AreaBoundary(BoundaryType::BOUNDARY_ELLIPSE, isInverted), _center(center), _radiusYSq(radiusY*radiusY), _scaleXSq(_radiusYSq / (radiusX*radiusX)) { }
-bool EllipseBoundary::IsWithinBoundaryArea(const Position* pos) const
+bool EllipseBoundary::IsWithinBoundaryArea(Position const* pos) const
 {
     if (!pos)
         return false;
@@ -76,7 +76,7 @@ TriangleBoundary::TriangleBoundary(Position const& pointA, Position const& point
     TriangleBoundary(DoublePosition(pointA), DoublePosition(pointB), DoublePosition(pointC), isInverted) { }
 TriangleBoundary::TriangleBoundary(DoublePosition const& pointA, DoublePosition const& pointB, DoublePosition const& pointC, bool isInverted) :
     AreaBoundary(BoundaryType::BOUNDARY_TRIANGLE, 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(const Position* pos) const
+bool TriangleBoundary::IsWithinBoundaryArea(Position const* pos) const
 {
     if (!pos)
         return false;
@@ -96,7 +96,7 @@ ParallelogramBoundary::ParallelogramBoundary(Position const& cornerA, Position c
     ParallelogramBoundary(DoublePosition(cornerA), DoublePosition(cornerB), DoublePosition(cornerD), isInverted) { }
 ParallelogramBoundary::ParallelogramBoundary(DoublePosition const& cornerA, DoublePosition const& cornerB, DoublePosition const& cornerD, bool isInverted) :
     AreaBoundary(BoundaryType::BOUNDARY_PARALLELOGRAM, 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(const Position* pos) const
+bool ParallelogramBoundary::IsWithinBoundaryArea(Position const* pos) const
 {
     if (!pos)
         return false;
@@ -115,7 +115,7 @@ bool ParallelogramBoundary::IsWithinBoundaryArea(const Position* pos) const
 // ---== Z RANGE ==---
 ZRangeBoundary::ZRangeBoundary(float minZ, float maxZ, bool isInverted) :
     AreaBoundary(BoundaryType::BOUNDARY_Z_RANGE, isInverted), _minZ(minZ), _maxZ(maxZ) { }
-bool ZRangeBoundary::IsWithinBoundaryArea(const Position* pos) const
+bool ZRangeBoundary::IsWithinBoundaryArea(Position const* pos) const
 {
     if (!pos)
         return false;
diff --git a/src/server/game/Maps/AreaBoundary.h b/src/server/game/Maps/AreaBoundary.h
index 59751b46223..c6b99c88194 100644
--- a/src/server/game/Maps/AreaBoundary.h
+++ b/src/server/game/Maps/AreaBoundary.h
@@ -34,7 +34,8 @@ class TC_GAME_API AreaBoundary
         };
         virtual ~AreaBoundary() { }
         BoundaryType GetBoundaryType() const { return m_boundaryType; }
-        bool IsWithinBoundary(const Position* pos) const { return (IsWithinBoundaryArea(pos) != m_isInvertedBoundary); }
+        bool IsWithinBoundary(Position const* pos) const { return (IsWithinBoundaryArea(pos) != m_isInvertedBoundary); }
+        bool IsWithinBoundary(Position const& pos) const { return IsWithinBoundary(&pos); }
 
         struct DoublePosition : Position
         {
@@ -43,7 +44,7 @@ class TC_GAME_API AreaBoundary
                 : Position(float(x), float(y), float(z), o), d_positionX(x), d_positionY(y), d_positionZ(z) { }
             DoublePosition(float x, float y = 0.0f, float z = 0.0f, float o = 0.0f)
                 : Position(x, y, z, o), d_positionX(x), d_positionY(y), d_positionZ(z) { }
-            DoublePosition(const Position& pos)
+            DoublePosition(Position const & pos)
                 : DoublePosition(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation()) { }
 
             double GetDoublePositionX() const { return d_positionX; }
@@ -61,7 +62,7 @@ class TC_GAME_API AreaBoundary
 
     protected:
         AreaBoundary(BoundaryType bType, bool isInverted) : m_boundaryType(bType), m_isInvertedBoundary(isInverted) { }
-        virtual bool IsWithinBoundaryArea(const Position* pos) const = 0;
+        virtual bool IsWithinBoundaryArea(Position const* pos) const = 0;
         const BoundaryType m_boundaryType;
         bool m_isInvertedBoundary;
 };
@@ -73,7 +74,7 @@ class TC_GAME_API RectangleBoundary : public AreaBoundary
         RectangleBoundary(float southX, float northX, float eastY, float westY, bool isInverted = false);
 
     protected:
-        bool IsWithinBoundaryArea(const Position* pos) const override;
+        bool IsWithinBoundaryArea(Position const* pos) const override;
 
     private:
         const float _minX, _maxX, _minY, _maxY;
@@ -88,7 +89,7 @@ class TC_GAME_API CircleBoundary : public AreaBoundary
         CircleBoundary(DoublePosition const& center, DoublePosition const& pointOnCircle, bool isInverted = false);
 
     protected:
-        bool IsWithinBoundaryArea(const Position* pos) const override;
+        bool IsWithinBoundaryArea(Position const* pos) const override;
 
     private:
         const DoublePosition _center;
@@ -102,7 +103,7 @@ class TC_GAME_API EllipseBoundary : public AreaBoundary
         EllipseBoundary(DoublePosition const& center, double radiusX, double radiusY, bool isInverted = false);
 
     protected:
-        bool IsWithinBoundaryArea(const Position* pos) const override;
+        bool IsWithinBoundaryArea(Position const* pos) const override;
 
     private:
         const DoublePosition _center;
@@ -116,7 +117,7 @@ class TC_GAME_API TriangleBoundary : public AreaBoundary
         TriangleBoundary(DoublePosition const& pointA, DoublePosition const& pointB, DoublePosition const& pointC, bool isInverted = false);
 
     protected:
-        bool IsWithinBoundaryArea(const Position* pos) const override;
+        bool IsWithinBoundaryArea(Position const* pos) const override;
 
     private:
         const DoublePosition _a, _b, _c;
@@ -131,7 +132,7 @@ class TC_GAME_API ParallelogramBoundary : public AreaBoundary
         ParallelogramBoundary(DoublePosition const& cornerA, DoublePosition const& cornerB, DoublePosition const& cornerD, bool isInverted = false);
 
     protected:
-        bool IsWithinBoundaryArea(const Position* pos) const override;
+        bool IsWithinBoundaryArea(Position const* pos) const override;
 
     private:
         const DoublePosition _a, _b, _d, _c;
@@ -144,7 +145,7 @@ class TC_GAME_API ZRangeBoundary : public AreaBoundary
         ZRangeBoundary(float minZ, float maxZ, bool isInverted = false);
 
     protected:
-        bool IsWithinBoundaryArea(const Position* pos) const override;
+        bool IsWithinBoundaryArea(Position const* pos) const override;
 
     private:
         const float _minZ, _maxZ;