diff options
| -rw-r--r-- | src/game/SharedDefines.h | 9 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h index ba86c83c8b8..f035e32d16f 100644 --- a/src/game/SharedDefines.h +++ b/src/game/SharedDefines.h @@ -181,11 +181,6 @@ enum SpellSchoolMask SPELL_SCHOOL_MASK_ALL = ( SPELL_SCHOOL_MASK_NORMAL | SPELL_SCHOOL_MASK_MAGIC ) }; -#define SPELL_SCHOOL_MASK_MAGIC \ - ( SPELL_SCHOOL_MASK_HOLY | SPELL_SCHOOL_MASK_FIRE | SPELL_SCHOOL_MASK_NATURE | \ - SPELL_SCHOOL_MASK_FROST | SPELL_SCHOOL_MASK_SHADOW | \ - SPELL_SCHOOL_MASK_ARCANE ) - inline SpellSchools GetFirstSchoolInMask(SpellSchoolMask mask) { for(int i = 0; i < MAX_SPELL_SCHOOL; ++i) @@ -430,7 +425,7 @@ const uint32 ItemQualityColors[MAX_ITEM_QUALITY] = { #define SPELL_ATTR_EX5_UNK31 0x80000000 // 31 Forces all nearby enemies to focus attacks caster #define SPELL_ATTR_EX6_UNK0 0x00000001 // 0 Only Move spell have this flag -#define SPELL_ATTR_EX6_UNK1 0x00000002 // 1 not set in 3.0.3 +#define SPELL_ATTR_EX6_UNK1 0x00000002 // 1 only usable in arena #define SPELL_ATTR_EX6_IGNORE_CASTER_AURAS 0x00000004 // 2 #define SPELL_ATTR_EX6_UNK3 0x00000008 // 3 #define SPELL_ATTR_EX6_UNK4 0x00000010 // 4 @@ -440,7 +435,7 @@ const uint32 ItemQualityColors[MAX_ITEM_QUALITY] = { #define SPELL_ATTR_EX6_UNK8 0x00000100 // 8 #define SPELL_ATTR_EX6_UNK9 0x00000200 // 9 #define SPELL_ATTR_EX6_UNK10 0x00000400 // 10 -#define SPELL_ATTR_EX6_UNK11 0x00000800 // 11 +#define SPELL_ATTR_EX6_UNK11 0x00000800 // 11 not usable in raid instance #define SPELL_ATTR_EX6_UNK12 0x00001000 // 12 #define SPELL_ATTR_EX6_UNK13 0x00002000 // 13 #define SPELL_ATTR_EX6_UNK14 0x00004000 // 14 diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 8e00fb6ac16..eba87182585 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -7677,7 +7677,7 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig case 48090: { // Get talent aura from owner - if (GetTypeId() == TYPEID_UNIT && ((Creature*)this)->isPet()) + if (isPet()) if (Unit * owner = GetOwner()) { if (AuraEffect * aurEff = owner->GetDummyAura(SPELLFAMILY_WARLOCK, 3220, 0)) |