diff options
author | megamage <none@none> | 2008-12-18 14:20:38 -0600 |
---|---|---|
committer | megamage <none@none> | 2008-12-18 14:20:38 -0600 |
commit | 058db69e0730975cd0e3e03e5abca78828808dd8 (patch) | |
tree | 989787da76a34d4dae3fb1dfa449f22b7195f1d0 /src | |
parent | f4afde50e0f4dfc3df37653bd781a5a723b8d6e2 (diff) |
*Fix build in Windows.
--HG--
branch : trunk
Diffstat (limited to 'src')
-rw-r--r-- | src/game/Map.h | 1 | ||||
-rw-r--r-- | src/game/Object.cpp | 6 | ||||
-rw-r--r-- | src/game/Object.h | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/src/game/Map.h b/src/game/Map.h index 201e69904d8..e88c1696772 100644 --- a/src/game/Map.h +++ b/src/game/Map.h @@ -43,6 +43,7 @@ class WorldPacket; class InstanceData; class Group; class InstanceSave; +class WorldObject; namespace ZThread { diff --git a/src/game/Object.cpp b/src/game/Object.cpp index b4be90747cf..858f141aa6c 100644 --- a/src/game/Object.cpp +++ b/src/game/Object.cpp @@ -1619,10 +1619,4 @@ void WorldObject::GetNearPoint(WorldObject const* searcher, float &x, float &y, z = GetPositionZ(); UpdateGroundPositionZ(x,y,z); -} - -template<class NOTIFIER> -void WorldObject::VisitNearbyObject(const float &radius, NOTIFIER ¬ifier) const -{ - GetMap()->VisitAll(GetPositionX(), GetPositionY(), radius, notifier); }
\ No newline at end of file diff --git a/src/game/Object.h b/src/game/Object.h index 8eb26784b21..547bde3a500 100644 --- a/src/game/Object.h +++ b/src/game/Object.h @@ -29,6 +29,7 @@ #include "ObjectDefines.h" #include "GridDefines.h" #include "CreatureAI.h" +#include "Map.h" #include <set> #include <string> @@ -479,7 +480,7 @@ class TRINITY_DLL_SPEC WorldObject : public Object Creature* SummonTrigger(float x, float y, float z, float ang, uint32 dur, CreatureAI* (*GetAI)(Creature*) = NULL); bool isActive() const { return m_isActive; } void setActive(bool isActive); - template<class NOTIFIER> void VisitNearbyObject(const float &radius, NOTIFIER ¬ifier) const; + template<class NOTIFIER> void VisitNearbyObject(const float &radius, NOTIFIER ¬ifier) const { GetMap()->VisitAll(GetPositionX(), GetPositionY(), radius, notifier); } protected: explicit WorldObject(); std::string m_name; |