*Fix Ferocious Bite energy to dmg conversion

*Remove duplicated AP coefficients for Hammer of Wrath and Avengers Shield
*Correctly do effectaddcombopoints for spells which take them.
*Do not proc spelleffects on player login.

--HG--
branch : trunk

1 files changed, 2 insertions, 1 deletions

diff --git a/src/game/Player.h b/src/game/Player.h
index c3328d0ebd7..9db0f28a9d0 100644
--- a/src/game/Player.h
+++ b/src/game/Player.h
@@ -1292,7 +1292,8 @@ class TRINITY_DLL_SPEC Player : public Unit
         uint8 GetComboPoints() { return m_comboPoints; }
         const uint64& GetComboTarget() const { return m_comboTarget; }
 
-        void AddComboPoints(Unit* target, int8 count);
+        void AddComboPoints(Unit* target, int8 count, Spell * spell = NULL);
+        void GainSpellComboPoints(int8 count);
         void ClearComboPoints();
         void SendComboPoints();