diff options
Diffstat (limited to 'src/server/scripts/Northrend')
9 files changed, 17 insertions, 17 deletions
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index d6ff08f3b1d..71487b5e048 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -396,7 +396,7 @@ public: std::list<Creature*> fireCyclonesList; Trinity::AllCreaturesOfEntryInRange checker(me, NPC_FIRE_CYCLONE, 200.0f); Trinity::CreatureListSearcher<Trinity::AllCreaturesOfEntryInRange> searcher(me, fireCyclonesList, checker); - me->VisitNearbyObject(200.0f, searcher); + Cell::VisitAllObjects(me, searcher, 200.0f); if (fireCyclonesList.empty()) return; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index 79c0336b9b6..598caddd72f 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -135,7 +135,7 @@ class OrbsDespawner : public BasicEvent bool Execute(uint64 /*currTime*/, uint32 /*diff*/) override { Trinity::CreatureWorker<OrbsDespawner> worker(_creature, *this); - _creature->VisitNearbyGridObject(5000.0f, worker); + Cell::VisitGridObjects(_creature, worker, SIZE_OF_GRIDS); return true; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp index 974ae333746..a30ea8e9cc5 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp @@ -1475,7 +1475,7 @@ struct npc_gunship_boarding_addAI : public gunship_npc_AI std::list<Player*> players; Trinity::UnitAuraCheck check(true, Instance->GetData(DATA_TEAM_IN_INSTANCE) == HORDE ? SPELL_ON_ORGRIMS_HAMMER_DECK : SPELL_ON_SKYBREAKER_DECK); Trinity::PlayerListSearcher<Trinity::UnitAuraCheck> searcher(me, players, check); - me->VisitNearbyWorldObject(200.0f, searcher); + Cell::VisitWorldObjects(me, searcher, 200.0f); players.remove_if([this](Player* player) { @@ -1539,7 +1539,7 @@ struct npc_gunship_boarding_addAI : public gunship_npc_AI std::list<Player*> players; Trinity::UnitAuraCheck check(true, Instance->GetData(DATA_TEAM_IN_INSTANCE) == HORDE ? SPELL_ON_ORGRIMS_HAMMER_DECK : SPELL_ON_SKYBREAKER_DECK); Trinity::PlayerListSearcher<Trinity::UnitAuraCheck> searcher(me, players, check); - me->VisitNearbyWorldObject(200.0f, searcher); + Cell::VisitWorldObjects(me, searcher,200.0f ); players.remove_if([this](Player* player) { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 030a64d8a97..e5736894b4c 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -533,7 +533,7 @@ class boss_the_lich_king : public CreatureScript // Reset The Frozen Throne gameobjects FrozenThroneResetWorker reset; Trinity::GameObjectWorker<FrozenThroneResetWorker> worker(me, reset); - me->VisitNearbyGridObject(333.0f, worker); + Cell::VisitGridObjects(me, worker, 333.0f); // Reset any light override me->GetMap()->SetZoneOverrideLight(AREA_ICECROWN_CITADEL, 0, 5000); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index c53783b06aa..867fc1ae688 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -223,7 +223,7 @@ class ValithriaDespawner : public BasicEvent bool Execute(uint64 /*currTime*/, uint32 /*diff*/) override { Trinity::CreatureWorker<ValithriaDespawner> worker(_creature, *this); - _creature->VisitNearbyGridObject(333.0f, worker); + Cell::VisitGridObjects(_creature, worker, 333.0f); return true; } @@ -728,7 +728,7 @@ class npc_risen_archmage : public CreatureScript std::list<Creature*> archmages; RisenArchmageCheck check; Trinity::CreatureListSearcher<RisenArchmageCheck> searcher(me, archmages, check); - me->VisitNearbyGridObject(100.0f, searcher); + Cell::VisitGridObjects(me, searcher, 100.0f); for (std::list<Creature*>::iterator itr = archmages.begin(); itr != archmages.end(); ++itr) (*itr)->AI()->DoAction(ACTION_ENTER_COMBAT); @@ -1103,7 +1103,7 @@ class npc_dream_cloud : public CreatureScript Player* player = nullptr; Trinity::AnyPlayerInObjectRangeCheck check(me, 5.0f); Trinity::PlayerSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(me, player, check); - me->VisitNearbyWorldObject(7.5f, searcher); + Cell::VisitWorldObjects(me, searcher, 7.5f); _events.ScheduleEvent(player ? EVENT_EXPLODE : EVENT_CHECK_PLAYER, 1000); break; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index c05029fb29e..6a56da6e902 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -1095,7 +1095,7 @@ class npc_crok_scourgebane : public CreatureScript std::list<Creature*> temp; FrostwingVrykulSearcher check(me, 80.0f); Trinity::CreatureListSearcher<FrostwingVrykulSearcher> searcher(me, temp, check); - me->VisitNearbyGridObject(80.0f, searcher); + Cell::VisitGridObjects(me, searcher, 80.0f); _aliveTrash.clear(); for (std::list<Creature*>::iterator itr = temp.begin(); itr != temp.end(); ++itr) @@ -1122,7 +1122,7 @@ class npc_crok_scourgebane : public CreatureScript Player* player = NULL; Trinity::AnyPlayerInObjectRangeCheck check(me, 60.0f); Trinity::PlayerSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(me, player, check); - me->VisitNearbyWorldObject(60.0f, searcher); + Cell::VisitWorldObjects(me, searcher, 60.0f); // wipe if (!player) { @@ -1131,7 +1131,7 @@ class npc_crok_scourgebane : public CreatureScript { FrostwingGauntletRespawner respawner; Trinity::CreatureWorker<FrostwingGauntletRespawner> worker(me, respawner); - me->VisitNearbyGridObject(333.0f, worker); + Cell::VisitGridObjects(me, worker, 333.0f); Talk(SAY_CROK_DEATH); } return; @@ -1436,7 +1436,7 @@ class npc_captain_arnath : public CreatureScript Creature* target = NULL; Trinity::MostHPMissingInRange u_check(me, 60.0f, 0); Trinity::CreatureLastSearcher<Trinity::MostHPMissingInRange> searcher(me, target, u_check); - me->VisitNearbyGridObject(60.0f, searcher); + Cell::VisitGridObjects(me, searcher, 60.0f); return target; } }; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index 0661d422904..d89a9d08fe5 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -1757,7 +1757,7 @@ class spell_vehicle_throw_passenger : public SpellScriptLoader std::list<WorldObject*> targetList; Trinity::WorldObjectSpellAreaTargetCheck check(99, GetExplTargetDest(), GetCaster(), GetCaster(), GetSpellInfo(), TARGET_CHECK_DEFAULT, NULL); Trinity::WorldObjectListSearcher<Trinity::WorldObjectSpellAreaTargetCheck> searcher(GetCaster(), targetList, check); - GetCaster()->GetMap()->VisitAll(GetCaster()->m_positionX, GetCaster()->m_positionY, 99, searcher); + Cell::VisitAllObjects(GetCaster(), searcher, 99.0f); float minDist = 99 * 99; Unit* target = NULL; for (std::list<WorldObject*>::iterator itr = targetList.begin(); itr != targetList.end(); ++itr) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index 8c6f9fc94f6..59b9cc5bcb1 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -520,7 +520,7 @@ class boss_hodir : public CreatureScript std::list<Unit*> TargetList; Trinity::AnyUnfriendlyUnitInObjectRangeCheck checker(me, me, 100.0f); Trinity::UnitListSearcher<Trinity::AnyUnfriendlyUnitInObjectRangeCheck> searcher(me, TargetList, checker); - me->VisitNearbyObject(100.0f, searcher); + Cell::VisitAllObjects(me, searcher, 100.0f); for (std::list<Unit*>::iterator itr = TargetList.begin(); itr != TargetList.end(); ++itr) { Unit* target = *itr; @@ -694,7 +694,7 @@ class npc_hodir_priest : public CreatureScript std::list<Unit*> TargetList; Trinity::AnyFriendlyUnitInObjectRangeCheck checker(me, me, 30.0f); Trinity::UnitListSearcher<Trinity::AnyFriendlyUnitInObjectRangeCheck> searcher(me, TargetList, checker); - me->VisitNearbyObject(30.0f, searcher); + Cell::VisitAllObjects(me, searcher, 30.0f); for (std::list<Unit*>::iterator itr = TargetList.begin(); itr != TargetList.end(); ++itr) if ((*itr)->HasAura(SPELL_FREEZE)) DoCast(*itr, SPELL_DISPEL_MAGIC, true); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index e63f8ca49d3..0dc4e553ad7 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -1033,7 +1033,7 @@ struct npc_thorim_trashAI : public ScriptedAI Unit* target = nullptr; MostHPMissingInRange checker(caster, range, heal); Trinity::UnitLastSearcher<MostHPMissingInRange> searcher(caster, target, checker); - caster->VisitNearbyObject(range, searcher); + Cell::VisitGridObjects(caster, searcher, range); return target; } @@ -2079,7 +2079,7 @@ class spell_thorim_activate_lightning_orb_periodic : public SpellScriptLoader UpperOrbCheck check; Trinity::CreatureListSearcher<UpperOrbCheck> searcher(caster, triggers, check); - caster->VisitNearbyGridObject(100.f, searcher); + Cell::VisitGridObjects(caster, searcher, 100.f); if (!triggers.empty()) { |