*Merge.

--HG-- branch : trunk
2009-04-18 11:05:35 -05:00
parent 5629168dbb 60736b1f7d
commit db65f3c111
8 changed files with 47 additions and 21 deletions
@@ -1581,8 +1581,11 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
        void AddPetAura(PetAura const* petSpell);
        void RemovePetAura(PetAura const* petSpell);

+        // relocation notification
        void SetToNotify();
        bool m_Notified, m_IsInNotifyList;
+        float oldX, oldY;
+
        void SetReducedThreatPercent(uint32 pct, uint64 guid)
        {
            m_reducedThreatPercent = pct;