aboutsummaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2025-06-17 23:09:08 +0200
committerShauren <shauren.trinity@gmail.com>2025-06-17 23:09:08 +0200
commit6502efbae802c2164c80769ff4c5389e4142d3b6 (patch)
tree08a2b9372d64205927a9d8a5c7d1a439997d8840 /src/server
parentde740f0e76f6ebd02fcdb93a7a86260fe595d10c (diff)
Core/Misc: Remove extremely forgettable tiny utility function
Diffstat (limited to 'src/server')
-rw-r--r--src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp6
-rw-r--r--src/server/game/Movement/MovementGenerators/FollowMovementGenerator.cpp3
2 files changed, 3 insertions, 6 deletions
diff --git a/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp
index a46bb1c6ab7..5575c9f6e0c 100644
--- a/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp
@@ -24,7 +24,6 @@
#include "MoveSplineInit.h"
#include "PathGenerator.h"
#include "Unit.h"
-#include "Util.h"
static bool HasLostTarget(Unit* owner, Unit* target)
{
@@ -44,10 +43,9 @@ static bool IsMutualChase(Unit* owner, Unit* target)
static bool PositionOkay(Unit* owner, Unit* target, Optional<float> minDistance, Optional<float> maxDistance, Optional<ChaseAngle> angle)
{
- float const distSq = owner->GetExactDistSq(target);
- if (minDistance && distSq < square(*minDistance))
+ if (minDistance && owner->IsInDist(target, *minDistance))
return false;
- if (maxDistance && distSq > square(*maxDistance))
+ if (maxDistance && !owner->IsInDist(target, *maxDistance))
return false;
if (angle && !angle->IsAngleOkay(target->GetRelativeAngle(owner)))
return false;
diff --git a/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.cpp
index 323e2663819..ee4ab14195d 100644
--- a/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.cpp
@@ -24,7 +24,6 @@
#include "PathGenerator.h"
#include "Pet.h"
#include "Unit.h"
-#include "Util.h"
static void DoMovementInform(Unit* owner, Unit* target)
{
@@ -51,7 +50,7 @@ FollowMovementGenerator::~FollowMovementGenerator() = default;
static bool PositionOkay(Unit* owner, Unit* target, float range, Optional<ChaseAngle> angle = {})
{
- if (owner->GetExactDistSq(target) > square(owner->GetCombatReach() + target->GetCombatReach() + range))
+ if (!owner->IsInDist(target, owner->GetCombatReach() + target->GetCombatReach() + range))
return false;
return !angle || angle->IsAngleOkay(target->GetRelativeAngle(owner));