*Merge.

--HG-- branch : trunk
2009-03-05 09:17:57 -06:00
parent 19ce0bb39f 465b10fc60
commit c1ea842cf7
13 changed files with 180 additions and 115 deletions
@@ -506,6 +506,8 @@ class TRINITY_DLL_SPEC WorldObject : public Object
        template<class NOTIFIER> void VisitNearbyObject(const float &radius, NOTIFIER &notifier) const { GetMap()->VisitAll(GetPositionX(), GetPositionY(), radius, notifier); }
        template<class NOTIFIER> void VisitNearbyGridObject(const float &radius, NOTIFIER &notifier) const { GetMap()->VisitGrid(GetPositionX(), GetPositionY(), radius, notifier); }
        template<class NOTIFIER> void VisitNearbyWorldObject(const float &radius, NOTIFIER &notifier) const { GetMap()->VisitWorld(GetPositionX(), GetPositionY(), radius, notifier); }
+        bool IsTempWorldObject;
+
    protected:
        explicit WorldObject();
        std::string m_name;