diff options
8 files changed, 10 insertions, 12 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 3102dac861e..6481325ec04 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -322,7 +322,7 @@ public: } dst = dst * pathRotation; - dst += PositionToVector3(&_owner.GetStationaryPosition()); + dst += PositionToVector3(_owner.GetStationaryPosition()); _owner.GetMap()->GameObjectRelocation(&_owner, dst.x, dst.y, dst.z, _owner.GetOrientation()); } 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 diff --git a/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp index 5575c9f6e0c..a954da2a85f 100644 --- a/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp @@ -205,7 +205,7 @@ bool ChaseMovementGenerator::Update(Unit* owner, uint32 diff) } if (shortenPath) - _path->ShortenPathUntilDist(PositionToVector3(target), maxTarget); + _path->ShortenPathUntilDist(PositionToVector3(target->GetPosition()), maxTarget); if (cOwner) cOwner->SetCannotReachTarget(false); diff --git a/src/server/game/Movement/PathGenerator.cpp b/src/server/game/Movement/PathGenerator.cpp index 8f44c3fcc29..04c4505f101 100644 --- a/src/server/game/Movement/PathGenerator.cpp +++ b/src/server/game/Movement/PathGenerator.cpp @@ -31,7 +31,7 @@ PathGenerator::PathGenerator(WorldObject const* owner) : _polyLength(0), _type(PATHFIND_BLANK), _useStraightPath(false), _forceDestination(false), _pointPathLimit(MAX_POINT_PATH_LENGTH), _useRaycast(false), - _startPosition(PositionToVector3(owner)), _endPosition(G3D::Vector3::zero()), _source(owner), _navMesh(nullptr), + _startPosition(PositionToVector3(owner->GetPosition())), _endPosition(G3D::Vector3::zero()), _source(owner), _navMesh(nullptr), _navMeshQuery(nullptr) { memset(_pathPolyRefs, 0, sizeof(_pathPolyRefs)); diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 3904b81a472..50db01b3fec 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -6393,7 +6393,7 @@ SpellCastResult Spell::CheckCast(bool strict, int32* param1 /*= nullptr*/, int32 else if (m_preGeneratedPath->IsInvalidDestinationZ(target)) // Check position z, if not in a straight line return SPELL_FAILED_NOPATH; - m_preGeneratedPath->ShortenPathUntilDist(PositionToVector3(target), objSize); // move back + m_preGeneratedPath->ShortenPathUntilDist(PositionToVector3(target->GetPosition()), objSize); // move back } break; } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index 1f2ebb020c9..01bd394f43c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -330,7 +330,7 @@ struct boss_razorscale : public BossAI std::function<void(Movement::MoveSplineInit&)> initializer = [](Movement::MoveSplineInit& init) { Movement::PointsArray path(std::size(RazorscalePath)); - std::transform(std::begin(RazorscalePath), std::end(RazorscalePath), path.begin(), [](Position pos) { return PositionToVector3(pos); }); + std::ranges::transform(RazorscalePath, path.begin(), PositionToVector3); init.MovebyPath(path, 0); init.SetCyclic(); init.SetFly(); diff --git a/src/server/scripts/Shadowlands/SepulcherOfTheFirstOnes/boss_anduin_wrynn.cpp b/src/server/scripts/Shadowlands/SepulcherOfTheFirstOnes/boss_anduin_wrynn.cpp index 4e0236a8963..fe5996968e4 100644 --- a/src/server/scripts/Shadowlands/SepulcherOfTheFirstOnes/boss_anduin_wrynn.cpp +++ b/src/server/scripts/Shadowlands/SepulcherOfTheFirstOnes/boss_anduin_wrynn.cpp @@ -2999,7 +2999,7 @@ struct at_anduin_wrynn_empowered_wicked_star : public at_anduin_wrynn_wicked_sta at->MovePositionToFirstCollision(destPos, 100.0f, angle); std::vector<G3D::Vector3> splinePoints; - splinePoints.push_back(PositionToVector3(at)); + splinePoints.push_back(PositionToVector3(at->GetPosition())); splinePoints.push_back(PositionToVector3(destPos)); at->InitSplines(splinePoints); diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index ab79773e642..d214753fee3 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -1130,8 +1130,8 @@ struct areatrigger_pri_divine_star : AreaTriggerAI Movement::PointsArray returnSplinePoints; - returnSplinePoints.push_back(PositionToVector3(at)); - returnSplinePoints.push_back(PositionToVector3(caster)); + returnSplinePoints.push_back(PositionToVector3(at->GetPosition())); + returnSplinePoints.push_back(PositionToVector3(caster->GetPosition())); at->InitSplines(returnSplinePoints); |