From b5c3ec952f94f85a8a5636f1bee163f8d92db1e8 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Tue, 24 May 2011 17:48:17 +0400 Subject: [PATCH] [11533] Fixed wrong call IsFitToFamilyMask in my prev commit. Also prevent like wrong usage in future by additional check. --- src/game/DBCStructure.h | 4 ++++ src/game/UnitAuraProcHandler.cpp | 2 +- src/shared/revision_nr.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/game/DBCStructure.h b/src/game/DBCStructure.h index 4f496e47b..f42ea3d67 100644 --- a/src/game/DBCStructure.h +++ b/src/game/DBCStructure.h @@ -1639,6 +1639,10 @@ struct SpellEntry private: // prevent creating custom entries (copy data from original in fact) SpellEntry(SpellEntry const&); // DON'T must have implementation + + // catch wrong uses + template + bool IsFitToFamilyMask(SpellFamily family, T t) const; }; struct SpellCastTimesEntry diff --git a/src/game/UnitAuraProcHandler.cpp b/src/game/UnitAuraProcHandler.cpp index 620e9c1e4..9d464ea54 100644 --- a/src/game/UnitAuraProcHandler.cpp +++ b/src/game/UnitAuraProcHandler.cpp @@ -3988,7 +3988,7 @@ SpellAuraProcResult Unit::HandleModResistanceAuraProc(Unit* /*pVictim*/, uint32 SpellEntry const *spellInfo = triggeredByAura->GetSpellProto(); // Inner Fire - if (spellInfo->IsFitToFamilyMask(SPELLFAMILY_PRIEST, UI64LIT(0x0000000000002))) + if (spellInfo->IsFitToFamily(SPELLFAMILY_PRIEST, UI64LIT(0x0000000000002))) { // only at real damage if (!damage) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index a9293671d..34df3207b 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11532" + #define REVISION_NR "11533" #endif // __REVISION_NR_H__