Core/Position: Allow implicit casting to G3D::Vector. Also, add a utility overload to MotionMaster.

2 files changed, 7 insertions, 0 deletions

diff --git a/src/server/game/Entities/Object/Position.cpp b/src/server/game/Entities/Object/Position.cpp
index c5b4cda29e4..c1bd90290eb 100644
--- a/src/server/game/Entities/Object/Position.cpp
+++ b/src/server/game/Entities/Object/Position.cpp
@@ -27,6 +27,11 @@ Position::Position(G3D::Vector3 const& vect)
     Relocate(vect.x, vect.y, vect.z, 0.f);
 }
 
+Position::operator G3D::Vector3() const
+{
+    return { m_positionX, m_positionY, m_positionZ };
+}
+
 bool Position::operator==(Position const &a)
 {
     return (G3D::fuzzyEq(a.m_positionX, m_positionX) &&
diff --git a/src/server/game/Entities/Object/Position.h b/src/server/game/Entities/Object/Position.h
index e01afe4cc71..b0909463162 100644
--- a/src/server/game/Entities/Object/Position.h
+++ b/src/server/game/Entities/Object/Position.h
@@ -36,6 +36,8 @@ struct TC_GAME_API Position
 
     Position(G3D::Vector3 const& vect);
 
+    operator G3D::Vector3() const;
+
     struct PositionXYStreamer
     {
         explicit PositionXYStreamer(Position& pos) : Pos(&pos) { }