Core/Spells: merged commits 86275a397a478a30dad7e00af73029e2b15d4668 ae070a1b64da616d4a6452793d22f80542a2c40f and

be7486fddb180dac66362a7ea4e0d330b6f27d37
This commit is contained in:
Ovalord authored and Aokromes committed 2017-10-17 01:06:15 +02:00
1 parent 7f4a7cbb17
commit 34b3617184
11 files changed
+47 -15

No files matched your search

+10
View File
@@ -574,6 +574,16 @@ float Unit::GetMeleeRange(Unit const* target) const
return std::max(range, NOMINAL_MELEE_RANGE);
}
bool Unit::IsWithinBoundaryRadius(const Unit* obj) const
{
if (!obj || !IsInMap(obj) || !IsInPhase(obj))
return false;
float objBoundaryRadius = std::max(obj->GetBoundaryRadius(), MIN_MELEE_REACH);
return IsInDist(obj, objBoundaryRadius);
}
void Unit::GetRandomContactPoint(const Unit* obj, float &x, float &y, float &z, float distance2dMin, float distance2dMax) const
{
float combat_reach = GetCombatReach();