aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2016-08-28 02:31:52 -0300
committerjoschiwald <joschiwald.trinity@gmail.com>2017-02-18 17:16:11 +0100
commit54b038fe2f4434fcf6b56bbbacc3cbb21d354249 (patch)
treef5f13777bcb2aba58fdf132da3ba6d00a31088c6
parentb3f993894af2963801fe79eabea6f5be1098161c (diff)
Core/Entities: Added possibility to construct a Position using a G3D::Vector3
(cherry picked from commit 17917171f3bb7d8c5727a1611ed017ebeccf5ae7)
-rw-r--r--src/server/game/Entities/Object/Position.cpp5
-rw-r--r--src/server/game/Entities/Object/Position.h2
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 8d597aecd51..ad3c5a2b03b 100644
--- a/src/server/game/Entities/Object/Position.cpp
+++ b/src/server/game/Entities/Object/Position.cpp
@@ -21,6 +21,11 @@
#include <G3D/g3dmath.h>
+Position::Position(G3D::Vector3 const& vect)
+{
+ Relocate(vect.x, vect.y, vect.z, 0.f);
+}
+
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 78fb88abd9c..b814b6bf9ed 100644
--- a/src/server/game/Entities/Object/Position.h
+++ b/src/server/game/Entities/Object/Position.h
@@ -31,6 +31,8 @@ struct TC_GAME_API Position
Position(Position const& loc) { Relocate(loc); }
+ Position(G3D::Vector3 const& vect);
+
struct PositionXYStreamer
{
explicit PositionXYStreamer(Position& pos) : Pos(&pos) { }