From ac3dbcb8803a43c7c313fd9fd3f4b91d5b3bf0b8 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Wed, 7 Jun 2017 09:53:04 +0200 Subject: [PATCH] Core/Utilities: Rename RandomResizeList->RandomResize as it is no longer restricted to a list --- src/common/Utilities/Containers.h | 10 +++++----- src/server/game/AI/CoreAI/UnitAI.h | 2 +- src/server/game/AI/ScriptedAI/ScriptedCreature.h | 4 ++-- src/server/game/AI/SmartScripts/SmartScript.cpp | 4 ++-- src/server/game/Spells/Spell.cpp | 4 ++-- .../BaradinHold/boss_pit_lord_argaloth.cpp | 2 +- .../scripts/EasternKingdoms/Karazhan/boss_moroes.cpp | 2 +- .../scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp | 2 +- src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp | 4 ++-- .../HallsOfOrigination/boss_earthrager_ptah.cpp | 6 +++--- .../scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp | 2 +- .../scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp | 2 +- .../scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp | 2 +- .../Kalimdor/VortexPinnacle/vortex_pinnacle.cpp | 2 +- .../ChamberOfAspects/RubySanctum/boss_halion.cpp | 2 +- .../RubySanctum/boss_saviana_ragefire.cpp | 2 +- .../HallsOfReflection/instance_halls_of_reflection.cpp | 4 ++-- .../IcecrownCitadel/boss_blood_queen_lana_thel.cpp | 6 +++--- .../Northrend/IcecrownCitadel/boss_festergut.cpp | 2 +- .../IcecrownCitadel/boss_professor_putricide.cpp | 2 +- .../scripts/Northrend/IcecrownCitadel/boss_rotface.cpp | 2 +- .../Northrend/IcecrownCitadel/boss_sindragosa.cpp | 2 +- .../Northrend/IcecrownCitadel/icecrown_citadel.cpp | 2 +- .../Northrend/Nexus/EyeOfEternity/boss_malygos.cpp | 8 ++++---- .../scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp | 2 +- src/server/scripts/Spells/spell_druid.cpp | 2 +- src/server/scripts/Spells/spell_item.cpp | 2 +- 27 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/common/Utilities/Containers.h b/src/common/Utilities/Containers.h index 193be75c3e..1f8df92b7b 100644 --- a/src/common/Utilities/Containers.h +++ b/src/common/Utilities/Containers.h @@ -54,7 +54,7 @@ namespace Trinity } template - void RandomResizeList(C& container, std::size_t requestedSize) + void RandomResize(C& container, std::size_t requestedSize) { uint32 currentSize = uint32(Size(container)); while (currentSize > requestedSize) @@ -67,7 +67,7 @@ namespace Trinity } template - void RandomResizeList(C& container, Predicate&& predicate, std::size_t requestedSize) + void RandomResize(C& container, Predicate&& predicate, std::size_t requestedSize) { //! First use predicate filter C containerCopy; @@ -75,7 +75,7 @@ namespace Trinity if (requestedSize) { std::copy_if(std::begin(container), std::end(container), std::inserter(containerCopy, std::end(containerCopy)), predicate); - RandomResizeList(containerCopy, requestedSize); + RandomResize(containerCopy, requestedSize); } container = std::move(containerCopy); @@ -87,7 +87,7 @@ namespace Trinity * Note: container cannot be empty */ template - inline auto SelectRandomContainerElement(C const& container) -> decltype(*std::begin(container)) const& + inline auto SelectRandomContainerElement(C const& container) -> typename std::add_const::type& { auto it = std::begin(container); std::advance(it, urand(0, uint32(Size(container)) - 1)); @@ -104,7 +104,7 @@ namespace Trinity * Note: container cannot be empty */ template - auto SelectRandomWeightedContainerElement(C const& container, std::vector weights) -> decltype(std::begin(container)) + inline auto SelectRandomWeightedContainerElement(C const& container, std::vector weights) -> decltype(std::begin(container)) { auto it = std::begin(container); std::advance(it, urandweighted(weights.size(), weights.data())); diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index e8ca470777..4f4240887f 100644 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -255,7 +255,7 @@ class TC_GAME_API UnitAI targetList.reverse(); if (targetType == SELECT_TARGET_RANDOM) - Trinity::Containers::RandomResizeList(targetList, maxTargets); + Trinity::Containers::RandomResize(targetList, maxTargets); else targetList.resize(maxTargets); } diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h index f1b25cd505..b4db664a98 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.h +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.h @@ -107,11 +107,11 @@ public: } template - void DoAction(int32 info, Predicate& predicate, uint16 max = 0) + void DoAction(int32 info, Predicate&& predicate, uint16 max = 0) { // We need to use a copy of SummonList here, otherwise original SummonList would be modified StorageType listCopy = storage_; - Trinity::Containers::RandomResizeList(listCopy, predicate, max); + Trinity::Containers::RandomResize(listCopy, std::forward(predicate), max); for (StorageType::iterator i = listCopy.begin(); i != listCopy.end(); ) { Creature* summon = ObjectAccessor::GetCreature(*me, *i++); diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 76a878f249..7c2480e8a0 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -483,7 +483,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u break; if (e.action.cast.targetsLimit > 0 && targets->size() > e.action.cast.targetsLimit) - Trinity::Containers::RandomResizeList(*targets, e.action.cast.targetsLimit); + Trinity::Containers::RandomResize(*targets, e.action.cast.targetsLimit); for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr) { @@ -556,7 +556,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u break; if (e.action.cast.targetsLimit > 0 && targets->size() > e.action.cast.targetsLimit) - Trinity::Containers::RandomResizeList(*targets, e.action.cast.targetsLimit); + Trinity::Containers::RandomResize(*targets, e.action.cast.targetsLimit); for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr) { diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index d86c136db5..58a4c0053e 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -1155,7 +1155,7 @@ void Spell::SelectImplicitConeTargets(SpellEffIndex effIndex, SpellImplicitTarge { // Other special target selection goes here if (uint32 maxTargets = m_spellValue->MaxAffectedTargets) - Trinity::Containers::RandomResizeList(targets, maxTargets); + Trinity::Containers::RandomResize(targets, maxTargets); for (std::list::iterator itr = targets.begin(); itr != targets.end(); ++itr) { @@ -1237,7 +1237,7 @@ void Spell::SelectImplicitAreaTargets(SpellEffIndex effIndex, SpellImplicitTarge { // Other special target selection goes here if (uint32 maxTargets = m_spellValue->MaxAffectedTargets) - Trinity::Containers::RandomResizeList(targets, maxTargets); + Trinity::Containers::RandomResize(targets, maxTargets); for (std::list::iterator itr = targets.begin(); itr != targets.end(); ++itr) { diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp index 9331ab6384..55f3cf92b6 100644 --- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp +++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp @@ -158,7 +158,7 @@ class spell_argaloth_consuming_darkness : public SpellScriptLoader void FilterTargets(std::list& targets) { - Trinity::Containers::RandomResizeList(targets, GetCaster()->GetMap()->Is25ManRaid() ? 8 : 3); + Trinity::Containers::RandomResize(targets, GetCaster()->GetMap()->Is25ManRaid() ? 8 : 3); } void Register() override diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index 41194939b5..1adbbec120 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -190,7 +190,7 @@ public: for (uint8 i = 0; i < 6; ++i) AddList.push_back(Adds[i]); - Trinity::Containers::RandomResizeList(AddList, 4); + Trinity::Containers::RandomResize(AddList, 4); uint8 i = 0; for (std::list::const_iterator itr = AddList.begin(); itr != AddList.end() && i < 4; ++itr, ++i) diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index 732c0fed94..93f6b3b1f3 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -184,7 +184,7 @@ class boss_mandokir : public CreatureScript GetCreatureListWithEntryInGrid(creatures, me, NPC_CHAINED_SPIRIT, 200.0f); creatures.remove_if(Trinity::AnyDeadUnitCheck()); creatures.remove_if(Trinity::UnitAuraCheck(true, SPELL_OHGAN_ORDERS_TRIGGER)); - Trinity::Containers::RandomResizeList(creatures, 1); + Trinity::Containers::RandomResize(creatures, 1); if (creatures.empty()) return; diff --git a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp index 52b87a57dd..24d9052bee 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp @@ -436,7 +436,7 @@ class spell_countdown_p1 : public SpellScriptLoader return; } - Trinity::Containers::RandomResizeList(targets, 2); + Trinity::Containers::RandomResize(targets, 2); target1 = targets.front(); target2 = targets.back(); } @@ -614,7 +614,7 @@ class spell_shards_of_torment : public SpellScriptLoader if ((targets.size() > numtargets) && GetCaster()->GetVictim()) targets.remove(GetCaster()->ToCreature()->GetVictim()); //Safe to remove tank from list - Trinity::Containers::RandomResizeList(targets, numtargets); + Trinity::Containers::RandomResize(targets, numtargets); } void Register() override diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp index 13c5ae2360..b749c57202 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp @@ -141,7 +141,7 @@ public: GetCreatureListWithEntryInGrid(stalkers, me, NPC_BEETLE_STALKER, 100.0f); std::list beetlers = stalkers; - Trinity::Containers::RandomResizeList(beetlers, 9); // Holds the summoners of Jeweled Scarab + Trinity::Containers::RandomResize(beetlers, 9); // Holds the summoners of Jeweled Scarab for (std::list::iterator itr = beetlers.begin(); itr != beetlers.end(); ++itr) { @@ -151,7 +151,7 @@ public: (*itr)->m_Events.AddEvent(new SummonScarab((*itr), instance), (*itr)->m_Events.CalculateTime(5000)); } - Trinity::Containers::RandomResizeList(stalkers, 2); // Holds the summoners of Dustbone Horror + Trinity::Containers::RandomResize(stalkers, 2); // Holds the summoners of Dustbone Horror for (std::list::iterator itr = stalkers.begin(); itr != stalkers.end(); ++itr) (*itr)->CastSpell((*itr), SPELL_SUMMON_DUSTBONE_HORROR); @@ -263,7 +263,7 @@ class spell_earthrager_ptah_flame_bolt : public SpellScriptLoader void FilterTargets(std::list& targets) { - Trinity::Containers::RandomResizeList(targets, GetCaster()->GetMap()->IsHeroic() ? 3 : 2); + Trinity::Containers::RandomResize(targets, GetCaster()->GetMap()->IsHeroic() ? 3 : 2); } void Register() override diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp index 164d0c49d8..9f214eb5e1 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp @@ -154,7 +154,7 @@ class boss_moam : public CreatureScript targetList.push_back((*itr)->getTarget()); } - Trinity::Containers::RandomResizeList(targetList, 5); + Trinity::Containers::RandomResize(targetList, 5); for (std::list::iterator itr = targetList.begin(); itr != targetList.end(); ++itr) DoCast(*itr, SPELL_DRAIN_MANA); diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp index f2b7c28951..514fb2a479 100644 --- a/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp +++ b/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp @@ -284,7 +284,7 @@ class spell_call_the_wind : public SpellScriptLoader return; targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_CALL_THE_WIND_AURA)); - Trinity::Containers::RandomResizeList(targets, 1); + Trinity::Containers::RandomResize(targets, 1); } void HandleDummy(SpellEffIndex /*effIndex*/) diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp index afdf53579e..0163085056 100644 --- a/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp +++ b/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp @@ -599,7 +599,7 @@ public: void SelectRandom(std::list& targets) { - Trinity::Containers::RandomResizeList(targets, 1); + Trinity::Containers::RandomResize(targets, 1); } void HandleDummy(SpellEffIndex /*effIndex*/) diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp index 89ccc40c55..579095cedb 100644 --- a/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp +++ b/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp @@ -972,7 +972,7 @@ public: void FilterTargets(std::list& targets) { - Trinity::Containers::RandomResizeList(targets, 1); + Trinity::Containers::RandomResize(targets, 1); } void Register() diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 5fba0b46e6..473d08abf9 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -1856,7 +1856,7 @@ class spell_halion_spawn_living_embers : public SpellScriptLoader void SelectMeteorFlames(std::list& unitList) { if (!unitList.empty()) - Trinity::Containers::RandomResizeList(unitList, 10); + Trinity::Containers::RandomResize(unitList, 10); } void HandleScript(SpellEffIndex /* effIndex */) diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp index fd28bb5d6d..96d6401248 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp @@ -240,7 +240,7 @@ class spell_saviana_conflagration_init : public SpellScriptLoader targets.remove_if(ConflagrationTargetSelector()); uint8 maxSize = uint8(GetCaster()->GetMap()->GetSpawnMode() & 1 ? 6 : 3); if (targets.size() > maxSize) - Trinity::Containers::RandomResizeList(targets, maxSize); + Trinity::Containers::RandomResize(targets, maxSize); } void HandleDummy(SpellEffIndex effIndex) diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index 3ee7660887..0cd5990beb 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -554,9 +554,9 @@ class instance_halls_of_reflection : public InstanceMapScript ObjectGuid bossGuid = i <= 3 ? FalricGUID : MarwynGUID; if (!i) - Trinity::Containers::RandomResizeList(tempList, 3); + Trinity::Containers::RandomResize(tempList, 3); else if (i < 6 && i != 3) - Trinity::Containers::RandomResizeList(tempList, 4); + Trinity::Containers::RandomResize(tempList, 4); for (uint32 entry : tempList) { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index ea722083f8..e070829ea1 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -409,7 +409,7 @@ class boss_blood_queen_lana_thel : public CreatureScript { std::list targets; SelectRandomTarget(false, &targets); - Trinity::Containers::RandomResizeList(targets, Is25ManRaid() ? 3 : 2); + Trinity::Containers::RandomResize(targets, Is25ManRaid() ? 3 : 2); if (targets.size() > 1) { Talk(SAY_PACT_OF_THE_DARKFALLEN); @@ -432,7 +432,7 @@ class boss_blood_queen_lana_thel : public CreatureScript { std::list targets; SelectRandomTarget(false, &targets); - Trinity::Containers::RandomResizeList(targets, uint32(Is25ManRaid() ? 4 : 2)); + Trinity::Containers::RandomResize(targets, uint32(Is25ManRaid() ? 4 : 2)); for (std::list::iterator itr = targets.begin(); itr != targets.end(); ++itr) DoCast(*itr, SPELL_TWILIGHT_BLOODBOLT); DoCast(me, SPELL_TWILIGHT_BLOODBOLT_TARGET); @@ -685,7 +685,7 @@ class spell_blood_queen_bloodbolt : public SpellScriptLoader { uint32 targetCount = (targets.size() + 2) / 3; targets.remove_if(BloodboltHitCheck(static_cast(GetCaster()->GetAI()))); - Trinity::Containers::RandomResizeList(targets, targetCount); + Trinity::Containers::RandomResize(targets, targetCount); // mark targets now, effect hook has missile travel time delay (might cast next in that time) for (std::list::const_iterator itr = targets.begin(); itr != targets.end(); ++itr) GetCaster()->GetAI()->SetGUID((*itr)->GetGUID(), GUID_BLOODBOLT); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index 4dfa7d2cd2..e92b66f358 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -221,7 +221,7 @@ class boss_festergut : public CreatureScript if (!ranged.empty()) { - Trinity::Containers::RandomResizeList(ranged, RAID_MODE(1, 3, 1, 3)); + Trinity::Containers::RandomResize(ranged, RAID_MODE(1, 3, 1, 3)); for (std::list::iterator itr = ranged.begin(); itr != ranged.end(); ++itr) DoCast(*itr, SPELL_VILE_GAS); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 8b738d7380..9599614320 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -1204,7 +1204,7 @@ class spell_putricide_unbound_plague : public SpellScriptLoader targets.remove_if(Trinity::UnitAuraCheck(true, sSpellMgr->GetSpellIdForDifficulty(SPELL_UNBOUND_PLAGUE, GetCaster()))); - Trinity::Containers::RandomResizeList(targets, 1); + Trinity::Containers::RandomResize(targets, 1); } void HandleScript(SpellEffIndex /*effIndex*/) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index ce7e062b55..21cb420cc5 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -848,7 +848,7 @@ class spell_rotface_vile_gas_trigger : public SpellScriptLoader } if (!ranged.empty()) - Trinity::Containers::RandomResizeList(ranged, GetCaster()->GetMap()->Is25ManRaid() ? 3 : 1); + Trinity::Containers::RandomResize(ranged, GetCaster()->GetMap()->Is25ManRaid() ? 3 : 1); targets.swap(ranged); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index ce3b273200..7ae563f834 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -1169,7 +1169,7 @@ class spell_sindragosa_unchained_magic : public SpellScriptLoader unitList.remove_if(UnchainedMagicTargetSelector()); uint32 maxSize = uint32(GetCaster()->GetMap()->GetSpawnMode() & 1 ? 6 : 2); if (unitList.size() > maxSize) - Trinity::Containers::RandomResizeList(unitList, maxSize); + Trinity::Containers::RandomResize(unitList, maxSize); } void Register() override diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 85fabd4bd3..09942ff45e 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -2009,7 +2009,7 @@ class spell_svalna_revive_champion : public SpellScriptLoader void RemoveAliveTarget(std::list& targets) { targets.remove_if(AliveCheck()); - Trinity::Containers::RandomResizeList(targets, 2); + Trinity::Containers::RandomResize(targets, 2); } void Land(SpellEffIndex /*effIndex*/) diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 5deb7fc515..0e64a02f0d 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -1739,10 +1739,10 @@ class spell_malygos_arcane_storm : public SpellScriptLoader { // Resize list only to objects that are vehicles. IsCreatureVehicleCheck check(true); - Trinity::Containers::RandomResizeList(targets, check, (malygos->GetMap()->GetDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL ? 4 : 10)); + Trinity::Containers::RandomResize(targets, check, (malygos->GetMap()->GetDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL ? 4 : 10)); } else - Trinity::Containers::RandomResizeList(targets, (malygos->GetMap()->GetDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL ? 4 : 10)); + Trinity::Containers::RandomResize(targets, (malygos->GetMap()->GetDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL ? 4 : 10)); } void HandleVisual(SpellEffIndex /*effIndex*/) @@ -2020,7 +2020,7 @@ class spell_scion_of_eternity_arcane_barrage : public SpellScriptLoader if (!targets.empty()) { if (targets.size() > 1) - Trinity::Containers::RandomResizeList(targets, 1); + Trinity::Containers::RandomResize(targets, 1); if (WorldObject* filteredTarget = targets.front()) if (malygos) @@ -2270,7 +2270,7 @@ class spell_malygos_surge_of_power_warning_selector_25 : public SpellScriptLoade std::list selectedTargets = targets; uint8 guidDataSlot = DATA_FIRST_SURGE_TARGET_GUID; // SetGuid in Malygos AI is reserved for 14th, 15th and 16th Id for the three targets - Trinity::Containers::RandomResizeList(selectedTargets, 3); + Trinity::Containers::RandomResize(selectedTargets, 3); for (std::list::const_iterator itr = selectedTargets.begin(); itr != selectedTargets.end(); ++itr) { Creature* target = (*itr)->ToCreature(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index 0856f1a457..e63f8ca49d 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -856,7 +856,7 @@ class boss_thorim : public CreatureScript triggerList.push_back(bunny); } else - Trinity::Containers::RandomResizeList(triggerList, count); + Trinity::Containers::RandomResize(triggerList, count); } void SummonWave() diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 9e0cc1bb7c..fe94fb7e8f 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -899,7 +899,7 @@ class spell_dru_starfall_dummy : public SpellScriptLoader void FilterTargets(std::list& targets) { - Trinity::Containers::RandomResizeList(targets, 2); + Trinity::Containers::RandomResize(targets, 2); } void HandleDummy(SpellEffIndex /*effIndex*/) diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index cc4f09260d..a5c719d87e 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -3954,7 +3954,7 @@ class spell_item_taunt_flag_targeting : public SpellScriptLoader return; } - Trinity::Containers::RandomResizeList(targets, 1); + Trinity::Containers::RandomResize(targets, 1); } void HandleDummy(SpellEffIndex /*effIndex*/)