diff options
Diffstat (limited to 'src/server/game/Entities/Object')
| -rw-r--r-- | src/server/game/Entities/Object/G3DPosition.hpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/server/game/Entities/Object/G3DPosition.hpp b/src/server/game/Entities/Object/G3DPosition.hpp index f83a900bcd9..9b1229c3ba0 100644 --- a/src/server/game/Entities/Object/G3DPosition.hpp +++ b/src/server/game/Entities/Object/G3DPosition.hpp @@ -20,10 +20,8 @@ #include "Position.h" #include <G3D/Vector3.h> -#include "Errors.h" -inline G3D::Vector3 PositionToVector3(Position const& p) { return { p.m_positionX, p.m_positionY, p.m_positionZ }; } -inline G3D::Vector3 PositionToVector3(Position const* p) { ASSERT(p); return { p->m_positionX, p->m_positionY, p->m_positionZ }; } -inline Position Vector3ToPosition(G3D::Vector3 const& v) { return { v.x, v.y, v.z }; } +inline constexpr auto PositionToVector3 = [](Position const& p) -> G3D::Vector3 { return { p.m_positionX, p.m_positionY, p.m_positionZ }; }; +inline constexpr auto Vector3ToPosition = [](G3D::Vector3 const& v) -> Position { return { v.x, v.y, v.z }; }; #endif |