diff options
13 files changed, 21 insertions, 21 deletions
diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp index 30bdd7b5c9b..7b6615f36f1 100644 --- a/src/server/game/AI/CreatureAI.cpp +++ b/src/server/game/AI/CreatureAI.cpp @@ -58,7 +58,7 @@ void CreatureAI::Talk(uint8 id, WorldObject const* whisperTarget /*= nullptr*/) sCreatureTextMgr->SendChat(me, id, whisperTarget); } -void CreatureAI::DoZoneInCombat(Creature* creature /*= nullptr*/, float maxRangeToNearestTarget /* = 250.0f*/) +void CreatureAI::DoZoneInCombat(Creature* creature /*= nullptr*/) { if (!creature) creature = me; diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h index d7cfec7b0b3..f189462bd8b 100644 --- a/src/server/game/AI/CreatureAI.h +++ b/src/server/game/AI/CreatureAI.h @@ -144,7 +144,7 @@ class TC_GAME_API CreatureAI : public UnitAI // Called at reaching home after evade virtual void JustReachedHome() { } - void DoZoneInCombat(Creature* creature = nullptr, float maxRangeToNearestTarget = 250.0f); + void DoZoneInCombat(Creature* creature = nullptr); // Called at text emote receive from player virtual void ReceiveEmote(Player* /*player*/, uint32 /*emoteId*/) { } diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index 414e86a3e1e..f58cd12829f 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -48,7 +48,7 @@ void SummonList::Despawn(Creature const* summon) storage_.remove(summon->GetGUID()); } -void SummonList::DoZoneInCombat(uint32 entry, float maxRangeToNearestTarget) +void SummonList::DoZoneInCombat(uint32 entry) { for (StorageType::iterator i = storage_.begin(); i != storage_.end();) { @@ -57,7 +57,7 @@ void SummonList::DoZoneInCombat(uint32 entry, float maxRangeToNearestTarget) if (summon && summon->IsAIEnabled && (!entry || summon->GetEntry() == entry)) { - summon->AI()->DoZoneInCombat(nullptr, maxRangeToNearestTarget); + summon->AI()->DoZoneInCombat(nullptr); } } } diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h index dd6726b0682..c7319a2eff6 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.h +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.h @@ -103,7 +103,7 @@ public: DoActionImpl(info, listCopy); } - void DoZoneInCombat(uint32 entry = 0, float maxRangeToNearestTarget = 250.0f); + void DoZoneInCombat(uint32 entry = 0); void RemoveNotExisting(); bool HasEntry(uint32 entry) const; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_horAI.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_horAI.cpp index 4cddd11befa..1c2ade73b62 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_horAI.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_horAI.cpp @@ -40,7 +40,7 @@ void boss_horAI::DoAction(int32 actionId) case ACTION_ENTER_COMBAT: // called by InstanceScript when boss shall enter in combat. me->SetImmuneToAll(false); me->SetReactState(REACT_AGGRESSIVE); - DoZoneInCombat(me, 150.0f); + DoZoneInCombat(me); break; default: break; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index 3a5c2764551..929124519f2 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -1657,7 +1657,7 @@ class npc_phantom_hallucination : public CreatureScript void Reset() override { - DoZoneInCombat(me, 150.0f); + DoZoneInCombat(me); } void EnterEvadeMode(EvadeReason why) override @@ -2182,7 +2182,7 @@ struct npc_escape_event_trash : public ScriptedAI void IsSummonedBy(Unit* /*summoner*/) override { - DoZoneInCombat(me, 0.0f); + DoZoneInCombat(me); if (Creature* leader = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_ESCAPE_LEADER))) { me->SetImmuneToPC(false); 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 0b09bb45b5f..ecab990df1a 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 @@ -592,7 +592,7 @@ class instance_halls_of_reflection : public InstanceMapScript temp->CastSpell(temp, SPELL_SPIRIT_ACTIVATE, false); temp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); temp->SetImmuneToAll(false); - temp->AI()->DoZoneInCombat(temp, 100.00f); + temp->AI()->DoZoneInCombat(temp); } } } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp index 6347974d543..490785f7294 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -218,7 +218,7 @@ class npc_faerlina_add : public CreatureScript void JustEngagedWith(Unit* /*who*/) override { if (Creature* faerlina = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_FAERLINA))) - faerlina->AI()->DoZoneInCombat(nullptr, 250.0f); + faerlina->AI()->DoZoneInCombat(); } void JustDied(Unit* /*killer*/) override diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index d18ef2a581e..8593905a057 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -166,7 +166,7 @@ public: summons.Summon(summon); summon->setActive(true); summon->SetFarVisible(true); - summon->AI()->DoZoneInCombat(nullptr, 250.0f); // specify range to cover entire room - default 50yd is not enough + summon->AI()->DoZoneInCombat(); } void JustDied(Unit* /*killer*/) override diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index 2f088274c6a..e6bd23bde49 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -189,7 +189,7 @@ class npc_dk_understudy : public CreatureScript { me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); if (Creature* razuvious = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_RAZUVIOUS))) - razuvious->AI()->DoZoneInCombat(nullptr, 250.0f); + razuvious->AI()->DoZoneInCombat(); } void JustReachedHome() override @@ -232,7 +232,7 @@ class npc_dk_understudy : public CreatureScript me->SetReactState(REACT_AGGRESSIVE); if (Unit* charmer = ObjectAccessor::GetUnit(*me, _charmer)) AddThreat(charmer, 100000.0f); - DoZoneInCombat(nullptr, 250.0f); + DoZoneInCombat(); } } private: diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index 141c005e5d6..eefb1f225dc 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -1610,7 +1610,7 @@ class npc_sif : public CreatureScript if (action == ACTION_START_HARD_MODE) { me->SetReactState(REACT_AGGRESSIVE); - DoZoneInCombat(me, 250.0f); + DoZoneInCombat(me); Talk(SAY_SIF_EVENT); _events.Reset(); _events.ScheduleEvent(EVENT_FROSTBOLT, 2000); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp index 0a7b2594f23..ffccacde115 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -104,7 +104,7 @@ struct generic_boss_controllerAI : public BossAI if (IsInGhostForm) { // Call this here since ghosts aren't set in combat as they spawn. - DoZoneInCombat(me, 50.0f); + DoZoneInCombat(me); } else _Reset(); diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index 3d5650aeaea..acd0c271480 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -558,7 +558,7 @@ class instance_violet_hold : public InstanceMapScript if (Creature* moragg = GetCreature(DATA_MORAGG)) { moragg->SetImmuneToAll(false); - moragg->AI()->DoZoneInCombat(moragg, 200.0f); + moragg->AI()->DoZoneInCombat(moragg); } }); }); @@ -596,7 +596,7 @@ class instance_violet_hold : public InstanceMapScript if (Creature* erekem = GetCreature(DATA_EREKEM)) { erekem->SetImmuneToAll(false); - erekem->AI()->DoZoneInCombat(erekem, 200.0f); + erekem->AI()->DoZoneInCombat(erekem); } }); }); @@ -619,7 +619,7 @@ class instance_violet_hold : public InstanceMapScript if (Creature* ichoron = GetCreature(DATA_ICHORON)) { ichoron->SetImmuneToAll(false); - ichoron->AI()->DoZoneInCombat(ichoron, 200.0f); + ichoron->AI()->DoZoneInCombat(ichoron); } }); }); @@ -641,7 +641,7 @@ class instance_violet_hold : public InstanceMapScript if (Creature* lavanthor = GetCreature(DATA_LAVANTHOR)) { lavanthor->SetImmuneToAll(false); - lavanthor->AI()->DoZoneInCombat(lavanthor, 200.0f); + lavanthor->AI()->DoZoneInCombat(lavanthor); } }); }); @@ -668,7 +668,7 @@ class instance_violet_hold : public InstanceMapScript if (Creature* xevozz = GetCreature(DATA_XEVOZZ)) { xevozz->SetImmuneToAll(false); - xevozz->AI()->DoZoneInCombat(xevozz, 200.0f); + xevozz->AI()->DoZoneInCombat(xevozz); } }); }); @@ -694,7 +694,7 @@ class instance_violet_hold : public InstanceMapScript if (Creature* zuramat = GetCreature(DATA_ZURAMAT)) { zuramat->SetImmuneToAll(false); - zuramat->AI()->DoZoneInCombat(zuramat, 200.0f); + zuramat->AI()->DoZoneInCombat(zuramat); } }); }); |