diff options
| author | ccrs <ccrs@users.noreply.github.com> | 2021-08-10 13:08:49 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-12 14:48:32 +0100 |
| commit | 5b6bcbff1a94c4bc32c42f05d77af97d63cef420 (patch) | |
| tree | 78211ec249518994e863ba7d4bb33f8be3e0317c /src | |
| parent | ac82e23fa3d2649ca2d0160ac477c9b0510d8200 (diff) | |
Core/Game: include addtional parameter in Object::GetPlayerListInGrid
(cherry picked from commit d49b6af71fae60f4bcb5fed4d745a020657f0b3a)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/AI/ScriptedAI/ScriptedCreature.h | 4 | ||||
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 10 | ||||
| -rw-r--r-- | src/server/game/Entities/Object/Object.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h index 3e719f24c5b..b984c8b5bdb 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.h +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.h @@ -407,9 +407,9 @@ inline void GetGameObjectListWithEntryInGrid(Container& container, WorldObject* } template <typename Container> -inline void GetPlayerListInGrid(Container& container, WorldObject* source, float maxSearchRange) +inline void GetPlayerListInGrid(Container& container, WorldObject* source, float maxSearchRange, bool alive = true) { - source->GetPlayerListInGrid(container, maxSearchRange); + source->GetPlayerListInGrid(container, maxSearchRange, alive); } #endif // TRINITY_SCRIPTEDCREATURE_H diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index d9993e84a94..7b9bd8a7b2b 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -3192,9 +3192,9 @@ void WorldObject::GetCreatureListWithEntryInGrid(Container& creatureContainer, u } template <typename Container> -void WorldObject::GetPlayerListInGrid(Container& playerContainer, float maxSearchRange) const +void WorldObject::GetPlayerListInGrid(Container& playerContainer, float maxSearchRange, bool alive /*= true*/) const { - Trinity::AnyPlayerInObjectRangeCheck checker(this, maxSearchRange); + Trinity::AnyPlayerInObjectRangeCheck checker(this, maxSearchRange, alive); Trinity::PlayerListSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(this, playerContainer, checker); Cell::VisitWorldObjects(this, searcher, maxSearchRange); } @@ -3631,6 +3631,6 @@ template TC_GAME_API void WorldObject::GetCreatureListWithEntryInGrid(std::list< template TC_GAME_API void WorldObject::GetCreatureListWithEntryInGrid(std::deque<Creature*>&, uint32, float) const; template TC_GAME_API void WorldObject::GetCreatureListWithEntryInGrid(std::vector<Creature*>&, uint32, float) const; -template TC_GAME_API void WorldObject::GetPlayerListInGrid(std::list<Player*>&, float) const; -template TC_GAME_API void WorldObject::GetPlayerListInGrid(std::deque<Player*>&, float) const; -template TC_GAME_API void WorldObject::GetPlayerListInGrid(std::vector<Player*>&, float) const; +template TC_GAME_API void WorldObject::GetPlayerListInGrid(std::list<Player*>&, float, bool) const; +template TC_GAME_API void WorldObject::GetPlayerListInGrid(std::deque<Player*>&, float, bool) const; +template TC_GAME_API void WorldObject::GetPlayerListInGrid(std::vector<Player*>&, float, bool) const; diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index 242f9151bd7..eec0d27c179 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -644,7 +644,7 @@ class TC_GAME_API WorldObject : public Object, public WorldLocation void GetCreatureListWithEntryInGrid(Container& creatureContainer, uint32 entry, float maxSearchRange = 250.0f) const; template <typename Container> - void GetPlayerListInGrid(Container& playerContainer, float maxSearchRange) const; + void GetPlayerListInGrid(Container& playerContainer, float maxSearchRange, bool alive = true) const; void DestroyForNearbyPlayers(); virtual void UpdateObjectVisibility(bool forced = true); |