diff options
author | treeston <treeston.mmoc@gmail.com> | 2016-01-18 18:35:20 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2016-03-22 23:37:02 +0100 |
commit | 5fb88c71213e0a64ec7e3312fc4460c4cc34abfa (patch) | |
tree | 750154ab19c9af8e63b8a4ba90df2d000fd13a41 /src/server/game/Maps/AreaBoundary.h | |
parent | 8911962c9eaf6cbcb0c21913da72fca24c36fe2f (diff) |
Merge branch '3.3.5-boundaryagain' into 3.3.5-base (PR #16270)
(cherry picked from commit 1050b68899c661ea09da9e36edb82e8648393673)
Diffstat (limited to 'src/server/game/Maps/AreaBoundary.h')
-rw-r--r-- | src/server/game/Maps/AreaBoundary.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/server/game/Maps/AreaBoundary.h b/src/server/game/Maps/AreaBoundary.h index 7df72c3dc12..a134b783ca6 100644 --- a/src/server/game/Maps/AreaBoundary.h +++ b/src/server/game/Maps/AreaBoundary.h @@ -32,15 +32,16 @@ class AreaBoundary BOUNDARY_PARALLELOGRAM, BOUNDARY_Z_RANGE, }; + virtual ~AreaBoundary() { } BoundaryType GetBoundaryType() const { return m_boundaryType; } bool IsWithinBoundary(const Position* pos) const { return (IsWithinBoundaryArea(pos) != m_isInvertedBoundary); } struct DoublePosition : Position { double d_positionX, d_positionY, d_positionZ; - DoublePosition(double x = 0, double y = 0, double z = 0, float o = 0) - : Position((float)x, (float)y, (float)z, o), d_positionX(x), d_positionY(y), d_positionZ(z) { } - DoublePosition(float x = 0, float y = 0, float z = 0, float o = 0) + DoublePosition(double x = 0.0, double y = 0.0, double z = 0.0, float o = 0.0f) + : Position(x, y, 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(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation()) { } |