refactor(Core): Rename ...Manager to ...Mgr (#6910)
* Rename MapManager.h to MapMgr.h * Rename BanManager.h to BanMgr.h * Rename MapManager.cpp to MapMgr.cpp * Rename BanManager.cpp to BanMgr.cpp * Rename MapRefManager.h to MapRefMgr.h * Rename ThreatManager.h to ThreatMgr.h * Rename GridRefManager.h to GridRefMgr.h * Rename ThreatManager.cpp to ThreatMgr.cpp * Rename GroupRefManager.h to GroupRefMgr.h * Rename HostileRefManager.h to HostileRefMgr.h * Rename HostileRefManager.cpp to HostileRefMgr.cpp * Rename MMapManager.h to MMapMgr.h * Rename FollowerRefManager.h to FollowerRefMgr.h * Rename VMapManager2.h to VMapMgr2.h * Rename IVMapManager.h to IVMapMgr.h * Rename MMapManager.cpp to MMapMgr.cpp * Rename VMapManager2.cpp to VMapMgr2.cpp * Rename RefManager.h to RefMgr.h * Rename WaypointManager.h to WaypointMgr.h * Rename WaypointManager.cpp to WaypointMgr.cpp * Rename MPQManager.h to MPQMgr.h * Rename MPQManager.cpp to MPQMgr.cpp * Rename IMMAPManager.h to IMMAPMgr.h * fix build * Update Main.cpp * chore(Core/Misc): Remove toxic language * Revert "chore(Core/Misc): Remove toxic language" * fix build * build
This commit is contained in:
+1
-1
@@ -103,7 +103,7 @@ public:
|
||||
{
|
||||
me->CastSpell(me, SPELL_INCITE_CHAOS, false);
|
||||
|
||||
std::list<HostileReference*> t_list = me->getThreatManager().getThreatList();
|
||||
std::list<HostileReference*> t_list = me->getThreatMgr().getThreatList();
|
||||
for (std::list<HostileReference*>::const_iterator itr = t_list.begin(); itr != t_list.end(); ++itr)
|
||||
{
|
||||
Unit* target = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid());
|
||||
|
||||
@@ -137,7 +137,7 @@ public:
|
||||
|
||||
if (!me->IsWithinMeleeRange(me->GetVictim()))
|
||||
{
|
||||
ThreatContainer::StorageType threatlist = me->getThreatManager().getThreatList();
|
||||
ThreatContainer::StorageType threatlist = me->getThreatMgr().getThreatList();
|
||||
for (ThreatContainer::StorageType::const_iterator i = threatlist.begin(); i != threatlist.end(); ++i)
|
||||
if (Unit* target = ObjectAccessor::GetUnit(*me, (*i)->getUnitGuid()))
|
||||
if (target->IsAlive() && me->IsWithinMeleeRange(target))
|
||||
|
||||
@@ -233,7 +233,7 @@ public:
|
||||
{
|
||||
PreventHitEffect(effIndex);
|
||||
if (Unit* target = GetHitUnit())
|
||||
GetCaster()->getThreatManager().modifyThreatPercent(target, -20);
|
||||
GetCaster()->getThreatMgr().modifyThreatPercent(target, -20);
|
||||
}
|
||||
|
||||
void Register() override
|
||||
|
||||
@@ -608,7 +608,7 @@ public:
|
||||
me->SetDisableGravity(false);
|
||||
break;
|
||||
case EVENT_START_PHASE_3_LAND:
|
||||
me->getThreatManager().resetAllAggro();
|
||||
me->getThreatMgr().resetAllAggro();
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetTarget(me->GetVictim()->GetGUID());
|
||||
AttackStart(me->GetVictim());
|
||||
@@ -621,7 +621,7 @@ public:
|
||||
// ///////////////////////////
|
||||
case EVENT_PHASE_4_START:
|
||||
me->CastSpell(me, SPELL_DEMON_TRANSFORM_1, true);
|
||||
me->getThreatManager().resetAllAggro();
|
||||
me->getThreatMgr().resetAllAggro();
|
||||
me->GetMotionMaster()->MoveChase(me->GetVictim(), 35.0f);
|
||||
events.Reset();
|
||||
events.ScheduleEvent(EVENT_SPELL_SHADOW_BLAST, 11000);
|
||||
@@ -644,7 +644,7 @@ public:
|
||||
break;
|
||||
case EVENT_REMOVE_DEMON_FORM:
|
||||
me->CastSpell(me, SPELL_DEMON_TRANSFORM_1, true);
|
||||
me->getThreatManager().resetAllAggro();
|
||||
me->getThreatMgr().resetAllAggro();
|
||||
events.Reset();
|
||||
if (summons.HasEntry(NPC_MAIEV_SHADOWSONG))
|
||||
{
|
||||
|
||||
@@ -113,7 +113,7 @@ public:
|
||||
Unit* FindHatefulStrikeTarget()
|
||||
{
|
||||
Unit* target = nullptr;
|
||||
ThreatContainer::StorageType const& threatlist = me->getThreatManager().getThreatList();
|
||||
ThreatContainer::StorageType const& threatlist = me->getThreatMgr().getThreatList();
|
||||
for (ThreatContainer::StorageType::const_iterator i = threatlist.begin(); i != threatlist.end(); ++i)
|
||||
{
|
||||
Unit* unit = ObjectAccessor::GetUnit(*me, (*i)->getUnitGuid());
|
||||
|
||||
+1
-1
@@ -342,7 +342,7 @@ public:
|
||||
void HandleScriptEffect(SpellEffIndex effIndex)
|
||||
{
|
||||
PreventHitDefaultEffect(effIndex);
|
||||
GetCaster()->getThreatManager().resetAllAggro();
|
||||
GetCaster()->getThreatMgr().resetAllAggro();
|
||||
|
||||
if (roll_chance_i(33))
|
||||
if (Unit* target = GetCaster()->GetAI()->SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true))
|
||||
|
||||
@@ -174,7 +174,7 @@ public:
|
||||
target = me->GetVictim();
|
||||
else
|
||||
{
|
||||
ThreatContainer::StorageType const& t_list = me->getThreatManager().getThreatList();
|
||||
ThreatContainer::StorageType const& t_list = me->getThreatMgr().getThreatList();
|
||||
for (ThreatContainer::StorageType::const_iterator itr = t_list.begin(); itr != t_list.end(); ++itr)
|
||||
if (Unit* threatTarget = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid()))
|
||||
if (me->IsWithinMeleeRange(threatTarget))
|
||||
|
||||
+1
-1
@@ -208,7 +208,7 @@ public:
|
||||
|
||||
// Xinef: if we have target we currently follow, return
|
||||
if (Unit* target = GetCaster()->GetVictim())
|
||||
if (GetCaster()->getThreatManager().getThreat(target) >= 100000.0f)
|
||||
if (GetCaster()->getThreatMgr().getThreat(target) >= 100000.0f)
|
||||
return;
|
||||
|
||||
// Xinef: acquire new target
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include "ScriptedCreature.h"
|
||||
#include "ScriptMgr.h"
|
||||
#include "the_eye.h"
|
||||
#include "WaypointManager.h"
|
||||
#include "WaypointMgr.h"
|
||||
|
||||
enum Spells
|
||||
{
|
||||
@@ -310,7 +310,7 @@ public:
|
||||
else
|
||||
{
|
||||
me->resetAttackTimer();
|
||||
ThreatContainer::StorageType const& threatList = me->getThreatManager().getThreatList();
|
||||
ThreatContainer::StorageType const& threatList = me->getThreatMgr().getThreatList();
|
||||
for (ThreatContainer::StorageType::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr)
|
||||
if (Unit* unit = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid()))
|
||||
if (me->IsWithinMeleeRange(unit))
|
||||
|
||||
@@ -984,7 +984,7 @@ public:
|
||||
{
|
||||
PreventHitEffect(effIndex);
|
||||
|
||||
ThreatContainer::StorageType const& ThreatList = GetCaster()-> getThreatManager().getThreatList();
|
||||
ThreatContainer::StorageType const& ThreatList = GetCaster()-> getThreatMgr().getThreatList();
|
||||
std::list<Unit*> targetList;
|
||||
for (ThreatContainer::StorageType::const_iterator itr = ThreatList.begin(); itr != ThreatList.end(); ++itr)
|
||||
{
|
||||
|
||||
@@ -1742,7 +1742,7 @@ public:
|
||||
// some code to cast spell Mana Burn on random target which has mana
|
||||
if (ManaBurnTimer <= diff)
|
||||
{
|
||||
std::list<HostileReference*> AggroList = me->getThreatManager().getThreatList();
|
||||
std::list<HostileReference*> AggroList = me->getThreatMgr().getThreatList();
|
||||
std::list<Unit*> UnitsWithMana;
|
||||
|
||||
for (std::list<HostileReference*>::const_iterator itr = AggroList.begin(); itr != AggroList.end(); ++itr)
|
||||
|
||||
@@ -482,7 +482,7 @@ public:
|
||||
AttackStart(Dragonmaw);
|
||||
}
|
||||
|
||||
HostileReference* ref = me->getThreatManager().getOnlineContainer().getReferenceByTarget(caster);
|
||||
HostileReference* ref = me->getThreatMgr().getOnlineContainer().getReferenceByTarget(caster);
|
||||
if (ref)
|
||||
ref->removeReference();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user