*More correct handling of fly mod auras.

*Pets now learn all levelup spells.
*Fix lightning overload.

--HG--
branch : trunk

1 files changed, 2 insertions, 3 deletions

diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index e3dfaf50477..200cc98d803 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -2578,10 +2578,9 @@ void SpellMgr::LoadPetLevelupSpellMap()
                     continue;
                 SpellEntry const *spell = sSpellStore.LookupEntry(skillLine->spellId);
                 // not exist or triggered or talent
-                if(!spell || !spell->spellLevel || GetTalentSpellPos(spell->Id))
+                if(!spell || !spell->spellLevel)
                     continue;
-                // TODO: some spells have no spellfamilyflag but should be learned
-                if (!spell->SpellFamilyName)
+                if(skillLine->learnOnGetSkill != ABILITY_LEARNED_ON_GET_RACE_OR_CLASS_SKILL)
                     continue;
                 mPetLevelupSpellMap.insert(PetLevelupSpellMap::value_type(creatureFamily->ID, std::make_pair(spell->spellLevel , spell->Id )));
                 count++;