Core/Units: Fixed autoattack range

Closes #17539
This commit is contained in:
Shauren authored and Aokromes committed 2016-07-20 19:12:44 +02:00
1 parent 0cb8e628d2
commit 8a5e7eba70
3 files changed
+56 -21

No files matched your search

+3 -4
View File
@@ -478,7 +478,7 @@ bool Unit::IsWithinCombatRange(const Unit* obj, float dist2compare) const
return distsq < maxdist * maxdist;
}
bool Unit::IsWithinMeleeRange(const Unit* obj, float dist) const
bool Unit::IsWithinMeleeRange(Unit const* obj) const
{
if (!obj || !IsInMap(obj) || !IsInPhase(obj))
return false;
@@ -488,10 +488,9 @@ bool Unit::IsWithinMeleeRange(const Unit* obj, float dist) const
float dz = GetPositionZMinusOffset() - obj->GetPositionZMinusOffset();
float distsq = dx*dx + dy*dy + dz*dz;
float sizefactor = GetCombatReach() + obj->GetCombatReach() + 4.0f / 3.0f;
float maxdist = dist + sizefactor;
float maxdist = GetCombatReach() + obj->GetCombatReach() + 4.0f / 3.0f;
return distsq < maxdist * maxdist;
return distsq <= maxdist * maxdist;
}
void Unit::GetRandomContactPoint(const Unit* obj, float &x, float &y, float &z, float distance2dMin, float distance2dMax) const