nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-18 19:35:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Core): rename namespaces and macros to acore (#2454)

Browse Source
This commit is contained in:
Viste
2019-12-01 15:13:31 +03:00
committed by Francesco Borzì
parent e19e95e5d0
commit e22d78ecd6
278 changed files with 1292 additions and 1309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/scripts/Spells/spell_dk.cpp
View File

@@ -1368,7 +1368,7 @@ class spell_dk_corpse_explosion : public SpellScriptLoader
FinishCast(SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW);
return;
}
target = Trinity::Containers::SelectRandomContainerElement(targets);
target = acore::Containers::SelectRandomContainerElement(targets);
targets.clear();
targets.push_back(target);
}
@@ -2255,7 +2255,7 @@ class spell_dk_raise_dead : public SpellScriptLoader
return;
}
WorldObject* target = Trinity::Containers::SelectRandomContainerElement(targets);
WorldObject* target = acore::Containers::SelectRandomContainerElement(targets);
targets.clear();
targets.push_back(target);
_corpse = true;

8
src/server/scripts/Spells/spell_druid.cpp
View File

@@ -1067,7 +1067,7 @@ class spell_dru_starfall_dummy : public SpellScriptLoader
void FilterTargets(std::list<WorldObject*>& targets)
{
Trinity::Containers::RandomResizeList(targets, 2);
acore::Containers::RandomResizeList(targets, 2);
}
void HandleDummy(SpellEffIndex /*effIndex*/)
@@ -1295,7 +1295,7 @@ class spell_dru_t10_restoration_4p_bonus : public SpellScriptLoader
return;
}
tempTargets.sort(Trinity::HealthPctOrderPred());
tempTargets.sort(acore::HealthPctOrderPred());
targets.clear();
targets.push_back(tempTargets.front());
}
@@ -1332,13 +1332,13 @@ class spell_dru_wild_growth : public SpellScriptLoader
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(Trinity::RaidCheck(GetCaster(), false));
targets.remove_if(acore::RaidCheck(GetCaster(), false));
uint32 const maxTargets = GetCaster()->HasAura(SPELL_DRUID_GLYPH_OF_WILD_GROWTH) ? 6 : 5;
if (targets.size() > maxTargets)
{
targets.sort(Trinity::HealthPctOrderPred());
targets.sort(acore::HealthPctOrderPred());
targets.resize(maxTargets);
}

10
src/server/scripts/Spells/spell_generic.cpp
View File

@@ -766,7 +766,7 @@ class spell_gen_select_target_count : public SpellScriptLoader
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove(GetCaster());
Trinity::Containers::RandomResizeList(targets, _count);
acore::Containers::RandomResizeList(targets, _count);
}
void Register()
@@ -1720,8 +1720,8 @@ class spell_gen_cannibalize : public SpellScriptLoader
float max_range = GetSpellInfo()->GetMaxRange(false);
WorldObject* result = NULL;
// search for nearby enemy corpse in range
Trinity::AnyDeadUnitSpellTargetInRangeCheck check(caster, max_range, GetSpellInfo(), TARGET_CHECK_CORPSE);
Trinity::WorldObjectSearcher<Trinity::AnyDeadUnitSpellTargetInRangeCheck> searcher(caster, result, check);
acore::AnyDeadUnitSpellTargetInRangeCheck check(caster, max_range, GetSpellInfo(), TARGET_CHECK_CORPSE);
acore::WorldObjectSearcher<acore::AnyDeadUnitSpellTargetInRangeCheck> searcher(caster, result, check);
caster->GetMap()->VisitFirstFound(caster->m_positionX, caster->m_positionY, max_range, searcher);
if (!result)
return SPELL_FAILED_NO_EDIBLE_CORPSES;
@@ -4766,13 +4766,13 @@ class spell_gen_replenishment : public SpellScriptLoader
}
}
targets.remove_if(Trinity::PowerCheck(POWER_MANA, false));
targets.remove_if(acore::PowerCheck(POWER_MANA, false));
uint8 const maxTargets = 10;
if (targets.size() > maxTargets)
{
targets.sort(Trinity::PowerPctOrderPred(POWER_MANA));
targets.sort(acore::PowerPctOrderPred(POWER_MANA));
targets.resize(maxTargets);
}
}

4
src/server/scripts/Spells/spell_hunter.cpp
View File

@@ -973,8 +973,8 @@ class spell_hun_pet_carrion_feeder : public SpellScriptLoader
float max_range = GetSpellInfo()->GetMaxRange(false);
WorldObject* result = NULL;
// search for nearby enemy corpse in range
Trinity::AnyDeadUnitSpellTargetInRangeCheck check(caster, max_range, GetSpellInfo(), TARGET_CHECK_ENEMY);
Trinity::WorldObjectSearcher<Trinity::AnyDeadUnitSpellTargetInRangeCheck> searcher(caster, result, check);
acore::AnyDeadUnitSpellTargetInRangeCheck check(caster, max_range, GetSpellInfo(), TARGET_CHECK_ENEMY);
acore::WorldObjectSearcher<acore::AnyDeadUnitSpellTargetInRangeCheck> searcher(caster, result, check);
caster->GetMap()->VisitFirstFound(caster->m_positionX, caster->m_positionY, max_range, searcher);
if (!result)
return SPELL_FAILED_NO_EDIBLE_CORPSES;

2
src/server/scripts/Spells/spell_item.cpp
View File

@@ -1910,7 +1910,7 @@ class spell_item_echoes_of_light : public SpellScriptLoader
if (targets.size() < 2)
return;
targets.sort(Trinity::HealthPctOrderPred());
targets.sort(acore::HealthPctOrderPred());
WorldObject* target = targets.front();
targets.clear();

4
src/server/scripts/Spells/spell_paladin.cpp
View File

@@ -662,7 +662,7 @@ class spell_pal_divine_storm_dummy : public SpellScriptLoader
void CountTargets(std::list<WorldObject*>& targetList)
{
Trinity::Containers::RandomResizeList(targetList, GetSpellValue()->MaxAffectedTargets);
acore::Containers::RandomResizeList(targetList, GetSpellValue()->MaxAffectedTargets);
_targetCount = targetList.size();
}
@@ -779,7 +779,7 @@ class spell_pal_glyph_of_holy_light : public SpellScriptLoader
if (targets.size() > maxTargets)
{
targets.sort(Trinity::HealthPctOrderPred());
targets.sort(acore::HealthPctOrderPred());
targets.resize(maxTargets);
}
}

16
src/server/scripts/Spells/spell_priest.cpp
View File

@@ -155,13 +155,13 @@ class spell_pri_circle_of_healing : public SpellScriptLoader
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(Trinity::RaidCheck(GetCaster(), false));
targets.remove_if(acore::RaidCheck(GetCaster(), false));
uint32 const maxTargets = GetCaster()->HasAura(SPELL_PRIEST_GLYPH_OF_CIRCLE_OF_HEALING) ? 6 : 5; // Glyph of Circle of Healing
if (targets.size() > maxTargets)
{
targets.sort(Trinity::HealthPctOrderPred());
targets.sort(acore::HealthPctOrderPred());
targets.resize(maxTargets);
}
}
@@ -240,13 +240,13 @@ class spell_pri_divine_hymn : public SpellScriptLoader
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(Trinity::RaidCheck(GetCaster(), false));
targets.remove_if(acore::RaidCheck(GetCaster(), false));
uint32 const maxTargets = 3;
if (targets.size() > maxTargets)
{
targets.sort(Trinity::HealthPctOrderPred());
targets.sort(acore::HealthPctOrderPred());
targets.resize(maxTargets);
}
}
@@ -370,14 +370,14 @@ class spell_pri_hymn_of_hope : public SpellScriptLoader
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(Trinity::PowerCheck(POWER_MANA, false));
targets.remove_if(Trinity::RaidCheck(GetCaster(), false));
targets.remove_if(acore::PowerCheck(POWER_MANA, false));
targets.remove_if(acore::RaidCheck(GetCaster(), false));
uint32 const maxTargets = 3;
if (targets.size() > maxTargets)
{
targets.sort(Trinity::PowerPctOrderPred(POWER_MANA));
targets.sort(acore::PowerPctOrderPred(POWER_MANA));
targets.resize(maxTargets);
}
}
@@ -562,7 +562,7 @@ class spell_pri_mind_sear : public SpellScriptLoader
void FilterTargets(std::list<WorldObject*>& unitList)
{
unitList.remove_if(Trinity::ObjectGUIDCheck(GetCaster()->GetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT), true));
unitList.remove_if(acore::ObjectGUIDCheck(GetCaster()->GetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT), true));
}
void Register()

4
src/server/scripts/Spells/spell_quest.cpp
View File

@@ -2398,8 +2398,8 @@ class spell_q11010_q11102_q11023_choose_loc : public SpellScriptLoader
Unit* caster = GetCaster();
// Check for player that is in 65 y range
std::list<Player*> playerList;
Trinity::AnyPlayerInObjectRangeCheck checker(caster, 65.0f);
Trinity::PlayerListSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(caster, playerList, checker);
acore::AnyPlayerInObjectRangeCheck checker(caster, 65.0f);
acore::PlayerListSearcher<acore::AnyPlayerInObjectRangeCheck> searcher(caster, playerList, checker);
caster->VisitNearbyWorldObject(65.0f, searcher);
for (std::list<Player*>::const_iterator itr = playerList.begin(); itr != playerList.end(); ++itr)
// Check if found player target is on fly mount or using flying form

2
src/server/scripts/Spells/spell_rogue.cpp
View File

@@ -399,7 +399,7 @@ class spell_rog_killing_spree : public SpellScriptLoader
{
while (!_targets.empty())
{
uint64 guid = Trinity::Containers::SelectRandomContainerElement(_targets);
uint64 guid = acore::Containers::SelectRandomContainerElement(_targets);
if (Unit* target = ObjectAccessor::GetUnit(*GetTarget(), guid))
{
// xinef: target may be no longer valid

10
src/server/scripts/Spells/spell_shaman.cpp
View File

@@ -426,7 +426,7 @@ class spell_sha_ancestral_awakening_proc : public SpellScriptLoader
if (targets.size() < 2)
return;
targets.sort(Trinity::HealthPctOrderPred());
targets.sort(acore::HealthPctOrderPred());
WorldObject* target = targets.front();
targets.clear();
@@ -518,8 +518,8 @@ class spell_sha_bloodlust : public SpellScriptLoader
void RemoveInvalidTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_SHAMAN_SATED));
targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_SHAMAN_EXHAUSTION));
targets.remove_if(acore::UnitAuraCheck(true, SPELL_SHAMAN_SATED));
targets.remove_if(acore::UnitAuraCheck(true, SPELL_SHAMAN_EXHAUSTION));
}
void ApplyDebuff()
@@ -981,8 +981,8 @@ class spell_sha_heroism : public SpellScriptLoader
void RemoveInvalidTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_SHAMAN_EXHAUSTION));
targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_SHAMAN_SATED));
targets.remove_if(acore::UnitAuraCheck(true, SPELL_SHAMAN_EXHAUSTION));
targets.remove_if(acore::UnitAuraCheck(true, SPELL_SHAMAN_SATED));
}
void ApplyDebuff()

2
src/server/scripts/Spells/spell_warrior.cpp
View File

@@ -168,7 +168,7 @@ class spell_warr_improved_spell_reflection_trigger : public SpellScriptLoader
void FilterTargets(std::list<WorldObject*>& unitList)
{
GetCaster()->RemoveAurasDueToSpell(SPELL_WARRIOR_SPELL_REFLECTION);
unitList.sort(Trinity::ObjectDistanceOrderPred(GetCaster()));
unitList.sort(acore::ObjectDistanceOrderPred(GetCaster()));
while (unitList.size() > GetSpellValue()->MaxAffectedTargets)
unitList.pop_back();
}