From cfabdd2fd265b38b8771fd870334dcc9b64a0c8a Mon Sep 17 00:00:00 2001 From: QAston Date: Sun, 19 Apr 2009 17:23:03 +0200 Subject: *Some changes to pet spell learning-now pet passives should work. *Fix a crash with lifebloom. --HG-- branch : trunk --- src/game/DBCStores.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/game/DBCStores.cpp') diff --git a/src/game/DBCStores.cpp b/src/game/DBCStores.cpp index 0e3b82c02c3..e1fe1eba5e7 100644 --- a/src/game/DBCStores.cpp +++ b/src/game/DBCStores.cpp @@ -326,7 +326,7 @@ void LoadDBCStores(const std::string& dataPath) if(spellInfo && (spellInfo->Attributes & 0x1D0) == 0x1D0) { - for (unsigned int i = 1; i < sCreatureFamilyStore.GetNumRows(); ++i) + for (uint32 i = 1; i < sCreatureFamilyStore.GetNumRows(); ++i) { CreatureFamilyEntry const* cFamily = sCreatureFamilyStore.LookupEntry(i); if(!cFamily) @@ -335,6 +335,10 @@ void LoadDBCStores(const std::string& dataPath) if(skillLine->skillId != cFamily->skillLine[0] && skillLine->skillId != cFamily->skillLine[1]) continue; + // Passive spell has to have spellfamilyflags if name present (need to not apply 20782) + if (spellInfo->Attributes & SPELL_ATTR_UNK18 && spellInfo->SpellFamilyName && !spellInfo->SpellFamilyFlags) + continue; + sPetFamilySpellsStore[i].insert(spellInfo->Id); } } -- cgit v1.2.3