*Merge.

--HG-- branch : trunk
2009-04-15 12:05:59 -05:00
parent 8089219695 57b33b244f
commit 8e910aca6b
7 changed files with 23 additions and 30 deletions
@@ -338,6 +338,7 @@ class TRINITY_DLL_SPEC AuraEffect
        int32 GetAuraAmplitude(){return m_amplitude;}
        virtual void Update(uint32 diff);

+        uint32 GetTickNumber() const { return m_tickNumber; }
        bool IsAreaAura() const { return m_isAreaAura; }
        bool IsPeriodic() const { return m_isPeriodic; }
        bool IsPersistent() const { return m_isPersistent; }
@@ -366,6 +367,7 @@ class TRINITY_DLL_SPEC AuraEffect
        Unit * const m_target;

        SpellEntry const *m_spellProto;
+        uint32 m_tickNumber;

        uint8 m_effIndex;
        AuraType m_auraName;