diff options
| author | QAston <none@none> | 2009-02-25 21:15:38 +0100 |
|---|---|---|
| committer | QAston <none@none> | 2009-02-25 21:15:38 +0100 |
| commit | 64540eff85465fca81121cc3de85fecc7315cf3e (patch) | |
| tree | 470cae1bb8bfea8d697ca6df7c7edc9ea4a45fed /src/game/SpellMgr.cpp | |
| parent | 50d2fc34ecc2c9e2481188d8ac10c8ad8e02303e (diff) | |
*Fix bug with spellproc.
*Fix bug with bloodthirst healing.
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellMgr.cpp')
| -rw-r--r-- | src/game/SpellMgr.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index f312329192c..5498c802f87 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1044,8 +1044,9 @@ void SpellMgr::LoadSpellProcEvents() spe.schoolMask = fields[1].GetUInt32(); spe.spellFamilyName = fields[2].GetUInt32(); - spe.spellFamilyMask = (uint64)fields[3].GetUInt32()|((uint64)fields[4].GetUInt32()<<32); - spe.spellFamilyMask2= fields[5].GetUInt32(); + spe.spellFamilyMask[0] = fields[3].GetUInt32(); + spe.spellFamilyMask[1] = fields[4].GetUInt32(); + spe.spellFamilyMask[2] = fields[5].GetUInt32(); spe.procFlags = fields[6].GetUInt32(); spe.procEx = fields[7].GetUInt32(); spe.ppmRate = fields[8].GetFloat(); @@ -1155,7 +1156,7 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const * spellP return false; // spellFamilyName is Ok need check for spellFamilyMask if present - if(spellProcEvent->spellFamilyMask || spellProcEvent->spellFamilyMask2) + if(spellProcEvent->spellFamilyMask) { if ((spellProcEvent->spellFamilyMask & procSpell->SpellFamilyFlags ) == 0) return false; |