*Merge.

--HG-- branch : trunk
2009-06-01 15:26:44 -05:00
parent 00d9a7b351 3a223e0e80
commit 30544055de
4 changed files with 60 additions and 6 deletions
@@ -1392,6 +1392,7 @@ class TRINITY_DLL_SPEC Player : public Unit
        bool IsAffectedBySpellmod(SpellEntry const *spellInfo, SpellModifier *mod, Spell const* spell = NULL);
        template <class T> T ApplySpellMod(uint32 spellId, SpellModOp op, T &basevalue, Spell const* spell = NULL);
        void RemoveSpellMods(Spell const* spell);
+        void RestoreSpellMods(Spell const* spell);

        bool HasSpellCooldown(uint32 spell_id) const
        {
@@ -2373,4 +2374,3 @@ template <class T> T Player::ApplySpellMod(uint32 spellId, SpellModOp op, T &bas
    return T(diff);
 }
 #endif
-