[3.3.5] Combat/Threat rewrite - prep & refactor (#19966)

* Combat/Threat rewrite (PR #19930) prep work. Mostly refactors, and a compatibility layer on ThreatManager/HostileReference that allows scripts to be changed already.
This commit is contained in:
Treeston authored and Ovahlord committed 2020-07-22 13:43:23 +02:00
1 parent f21877e00f
commit ec04d3b2cd
218 files changed
+1021 -1105

No files matched your search

+2 -12
View File
@@ -572,18 +572,8 @@ bool SmartAI::AssistPlayerInCombatAgainst(Unit* who)
// too far away and no free sight?
if (me->IsWithinDistInMap(who, SMART_MAX_AID_DIST) && me->IsWithinLOSInMap(who))
{
// already fighting someone?
if (!me->GetVictim())
{
AttackStart(who);
return true;
}
else
{
who->SetInCombatWith(me);
me->AddThreat(who, 0.0f);
return true;
}
me->EngageWithTarget(who);
return true;
}
return false;