diff --git a/src/game/GridNotifiers.h b/src/game/GridNotifiers.h index df9424f3f..1bf7976cc 100644 --- a/src/game/GridNotifiers.h +++ b/src/game/GridNotifiers.h @@ -1153,6 +1153,28 @@ namespace MaNGOS NearestCreatureEntryWithLiveStateInObjectRangeCheck(NearestCreatureEntryWithLiveStateInObjectRangeCheck const&); }; + class AllCreaturesOfEntryInRangeCheck + { + public: + AllCreaturesOfEntryInRangeCheck(const WorldObject* pObject, uint32 uiEntry, float fMaxRange) : m_pObject(pObject), m_uiEntry(uiEntry), m_fRange(fMaxRange) {} + WorldObject const& GetFocusObject() const { return *m_pObject; } + bool operator() (Unit* pUnit) + { + if (pUnit->GetEntry() == m_uiEntry && m_pObject->IsWithinDist(pUnit,m_fRange,false)) + return true; + + return false; + } + + private: + const WorldObject* m_pObject; + uint32 m_uiEntry; + float m_fRange; + + // prevent clone this object + AllCreaturesOfEntryInRangeCheck(AllCreaturesOfEntryInRangeCheck const&); + }; + // Player checks and do class AnyPlayerInObjectRangeCheck diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index e43f4a1e9..47e3c6b11 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11961" + #define REVISION_NR "11962" #endif // __REVISION_NR_H__