*Fix build in Windows.
--HG-- branch : trunk
This commit is contained in:
@@ -43,6 +43,7 @@ class WorldPacket;
|
|||||||
class InstanceData;
|
class InstanceData;
|
||||||
class Group;
|
class Group;
|
||||||
class InstanceSave;
|
class InstanceSave;
|
||||||
|
class WorldObject;
|
||||||
|
|
||||||
namespace ZThread
|
namespace ZThread
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1620,9 +1620,3 @@ void WorldObject::GetNearPoint(WorldObject const* searcher, float &x, float &y,
|
|||||||
|
|
||||||
UpdateGroundPositionZ(x,y,z);
|
UpdateGroundPositionZ(x,y,z);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class NOTIFIER>
|
|
||||||
void WorldObject::VisitNearbyObject(const float &radius, NOTIFIER ¬ifier) const
|
|
||||||
{
|
|
||||||
GetMap()->VisitAll(GetPositionX(), GetPositionY(), radius, notifier);
|
|
||||||
}
|
|
||||||
+2
-1
@@ -29,6 +29,7 @@
|
|||||||
#include "ObjectDefines.h"
|
#include "ObjectDefines.h"
|
||||||
#include "GridDefines.h"
|
#include "GridDefines.h"
|
||||||
#include "CreatureAI.h"
|
#include "CreatureAI.h"
|
||||||
|
#include "Map.h"
|
||||||
|
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <string>
|
#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);
|
Creature* SummonTrigger(float x, float y, float z, float ang, uint32 dur, CreatureAI* (*GetAI)(Creature*) = NULL);
|
||||||
bool isActive() const { return m_isActive; }
|
bool isActive() const { return m_isActive; }
|
||||||
void setActive(bool 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:
|
protected:
|
||||||
explicit WorldObject();
|
explicit WorldObject();
|
||||||
std::string m_name;
|
std::string m_name;
|
||||||
|
|||||||
Reference in New Issue
Block a user