*Merge

--HG-- branch : trunk
2009-03-10 00:54:42 +01:00
parent 19717bbaa6 19af8f62ad
commit 7cc3dfa8d5
5 changed files with 66 additions and 54 deletions
@@ -295,6 +295,7 @@ class TRINITY_DLL_SPEC Aura
        bool IsDeathPersistent() const { return m_isDeathPersist; }
        bool IsRemovedOnShapeLost() const { return m_isRemovedOnShapeLost; }
        bool IsInUse() const { return m_in_use;}
+        void CleanupTriggeredSpells();

        virtual void Update(uint32 diff);
        void ApplyModifier(bool apply, bool Real = false);
@@ -365,7 +366,6 @@ class TRINITY_DLL_SPEC Aura
        bool m_in_use:1;                                    // true while in Aura::ApplyModifier call

    private:
-        void CleanupTriggeredSpells();
 };

 class TRINITY_DLL_SPEC AreaAura : public Aura