diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-04-27 00:33:27 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-04-27 00:33:27 +0200 |
| commit | 675a2fcd3b4e46b79c57ead0fc455c4f6e4b03db (patch) | |
| tree | 1626c74b3e3d84423b4467fc998743e4780f4d60 /src/server/game/Spells/SpellInfo.cpp | |
| parent | 800d5d893964a82265577d3352d683035b589f78 (diff) | |
Core/Util: Fixed flag128 and removed flag96 - previously if flag128 and flag96 were used in together the result was always a bool instead of expected flag result due to implicit boolean conversion
Diffstat (limited to 'src/server/game/Spells/SpellInfo.cpp')
| -rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 1334f5840ab..4db7091f971 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -1061,7 +1061,7 @@ SpellInfo::SpellInfo(SpellEntry const* spellEntry, SpellEffectEntryMap const& ef // SpellClassOptionsEntry SpellClassOptionsEntry const* _class = GetSpellClassOptions(); SpellFamilyName = _class ? _class->SpellClassSet : 0; - SpellFamilyFlags = _class ? _class->SpellClassMask : flag128(0); + SpellFamilyFlags = _class ? _class->SpellClassMask : flag128(); // SpellCooldownsEntry SpellCooldownsEntry const* _cooldowns = GetSpellCooldowns(); @@ -2363,7 +2363,7 @@ SpellSpecificType SpellInfo::GetSpellSpecific() const return SPELL_SPECIFIC_STING; // only hunter aspects have this (but not all aspects in hunter family) - if (SpellFamilyFlags & flag96(0x00380000, 0x00440000, 0x00001010)) + if (SpellFamilyFlags & flag128(0x00200000, 0x00000000, 0x00001010, 0x00000000)) return SPELL_SPECIFIC_ASPECT; break; |