From c00a2efb21356eb4105cb7db9112c708762d9191 Mon Sep 17 00:00:00 2001 From: Treeston Date: Wed, 22 Aug 2018 21:51:16 +0200 Subject: Core/AI: Remove unnecessary parameter from DoZoneInCombat after eb1972f --- src/server/game/AI/CreatureAI.cpp | 2 +- src/server/game/AI/CreatureAI.h | 2 +- src/server/game/AI/ScriptedAI/ScriptedCreature.cpp | 4 ++-- src/server/game/AI/ScriptedAI/ScriptedCreature.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/server/game') 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; -- cgit v1.2.3