diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2018-04-01 13:52:36 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-09-23 22:21:29 +0200 |
| commit | bc89e1cdb0da10e53cc9fa4a97565c05bb4c052e (patch) | |
| tree | 5725af072958ca1fa59e6154bcb1e70351f35264 /src/server/game/Movement | |
| parent | bf958da14828123442781f98443326b0f916b34b (diff) | |
Core/Position: Refactor GetAngle -> GetAbsoluteAngle because code clarity is good.
(cherry picked from commit 4692e10ca2ffed5ba2a0336e9c93962b0fad9eaa)
Diffstat (limited to 'src/server/game/Movement')
4 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index d7be55b03e7..a4f9e955644 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -337,7 +337,7 @@ void MotionMaster::MoveCloserAndStop(uint32 id, Unit* target, float distance) float distanceToTravel = _owner->GetExactDist2d(target) - distance; if (distanceToTravel > 0.0f) { - float angle = _owner->GetAngle(target); + float angle = _owner->GetAbsoluteAngle(target); float destx = _owner->GetPositionX() + distanceToTravel * std::cos(angle); float desty = _owner->GetPositionY() + distanceToTravel * std::sin(angle); MovePoint(id, destx, desty, target->GetPositionZ()); @@ -432,7 +432,7 @@ void MotionMaster::MoveKnockbackFrom(float srcX, float srcY, float speedXY, floa float dist = 2 * moveTimeHalf * speedXY; float max_height = -Movement::computeFallElevation(moveTimeHalf, false, -speedZ); - _owner->GetNearPoint(_owner, x, y, z, _owner->GetCombatReach(), dist, _owner->GetAngle(srcX, srcY) + float(M_PI)); + _owner->GetNearPoint(_owner, x, y, z, _owner->GetCombatReach(), dist, _owner->GetAbsoluteAngle(srcX, srcY) + float(M_PI)); Movement::MoveSplineInit init(_owner); init.MoveTo(x, y, z); @@ -497,7 +497,7 @@ void MotionMaster::MoveCirclePath(float x, float y, float z, float radius, bool { float step = 2 * float(M_PI) / stepCount * (clockwise ? -1.0f : 1.0f); Position const& pos = { x, y, z, 0.0f }; - float angle = pos.GetAngle(_owner->GetPositionX(), _owner->GetPositionY()); + float angle = pos.GetAbsoluteAngle(_owner->GetPositionX(), _owner->GetPositionY()); Movement::MoveSplineInit init(_owner); diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp index d4bc99da9ec..d142913268f 100644 --- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp @@ -147,7 +147,7 @@ void FleeingMovementGenerator<T>::GetPoint(T* owner, Position &position) { casterDistance = fleeTarget->GetDistance(owner); if (casterDistance > 0.2f) - casterAngle = fleeTarget->GetAngle(owner); + casterAngle = fleeTarget->GetAbsoluteAngle(owner); else casterAngle = frand(0.0f, 2.0f * float(M_PI)); } diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp index 7452b9a93a4..67cc7e69465 100755 --- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp @@ -134,7 +134,7 @@ void TargetedMovementGenerator<T, D>::SetTargetLocation(T* owner, bool updateDes if (hoverDiff) size = size > hoverDiff ? std::sqrt(size * size - hoverDiff * hoverDiff) : 0.0f; - GetTarget()->GetNearPoint(owner, x, y, z, size, CONTACT_DISTANCE, GetTarget()->GetAngle(owner)); + GetTarget()->GetNearPoint(owner, x, y, z, size, CONTACT_DISTANCE, GetTarget()->GetAbsoluteAngle(owner)); } else { diff --git a/src/server/game/Movement/Spline/MoveSplineInit.cpp b/src/server/game/Movement/Spline/MoveSplineInit.cpp index a5d6a7c86f3..efe2b820de7 100644 --- a/src/server/game/Movement/Spline/MoveSplineInit.cpp +++ b/src/server/game/Movement/Spline/MoveSplineInit.cpp @@ -203,7 +203,7 @@ namespace Movement void MoveSplineInit::SetFacing(Unit const* target) { - args.facing.angle = unit->GetAngle(target); + args.facing.angle = unit->GetAbsoluteAngle(target); args.facing.target = target->GetGUID(); args.facing.type = MONSTER_MOVE_FACING_TARGET; } |
