diff options
Diffstat (limited to 'src/server')
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.h | 2 | ||||
| -rwxr-xr-x | src/server/game/Miscellaneous/SharedDefines.h | 6 | ||||
| -rwxr-xr-x | src/server/game/Spells/Spell.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 198b5bd4542..64b2042b0f0 100755 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -44,7 +44,7 @@ enum SpellInterruptFlags SPELL_INTERRUPT_FLAG_MOVEMENT = 0x01, // why need this for instant? SPELL_INTERRUPT_FLAG_PUSH_BACK = 0x02, // push back SPELL_INTERRUPT_FLAG_INTERRUPT = 0x04, // interrupt - SPELL_INTERRUPT_FLAG_AUTOATTACK = 0x08, // no + SPELL_INTERRUPT_FLAG_AUTOATTACK = 0x08, // enter combat SPELL_INTERRUPT_FLAG_ABORT_ON_DMG = 0x10, // _complete_ interrupt on direct damage //SPELL_INTERRUPT_UNK = 0x20 // unk, 564 of 727 spells having this spell start with "Glyph" }; diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 6819f059fef..c103a89247f 100755 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -308,11 +308,11 @@ enum SpellAttr1 SPELL_ATTR1_CHANNELED_2 = 0x00000040, // 6 SPELL_ATTR1_NEGATIVE = 0x00000080, // 7 SPELL_ATTR1_NOT_IN_COMBAT_TARGET = 0x00000100, // 8 Spell req target not to be in combat state - SPELL_ATTR1_UNK9 = 0x00000200, // 9 melee spells + SPELL_ATTR1_MELEE_COMBAT_SPELL = 0x00000200, // 9 spells with this flag can be cast only if caster is able to melee attack target SPELL_ATTR1_NO_THREAT = 0x00000400, // 10 no generates threat on cast 100% (old NO_INITIAL_AGGRO) SPELL_ATTR1_UNK11 = 0x00000800, // 11 aura SPELL_ATTR1_UNK12 = 0x00001000, // 12 - SPELL_ATTR1_USE_RADIUS_AS_MAX_DISTANCE = 0x00002000, // 13 Client removes farsight on aura loss + SPELL_ATTR1_FARSIGHT = 0x00002000, // 13 Client removes farsight on aura loss SPELL_ATTR1_CHANNEL_TRACK_TARGET = 0x00004000, // 14 Client automatically forces player to face target when channeling SPELL_ATTR1_DISPEL_AURAS_ON_IMMUNITY = 0x00008000, // 15 remove auras on immunity SPELL_ATTR1_UNAFFECTED_BY_SCHOOL_IMMUNE = 0x00010000, // 16 on immuniy @@ -327,7 +327,7 @@ enum SpellAttr1 SPELL_ATTR1_UNK25 = 0x02000000, // 25 SPELL_ATTR1_UNK26 = 0x04000000, // 26 works correctly with [target=focus] and [target=mouseover] macros? SPELL_ATTR1_UNK27 = 0x08000000, // 27 - SPELL_ATTR1_IGNORE_IMMUNITY = 0x10000000, // 28 removed from Chains of Ice 3.3.0 + SPELL_ATTR1_DONT_DISPLAY_IN_AURA_BAR = 0x10000000, // 28 client doesn't display these spells in aura bar SPELL_ATTR1_CHANNEL_DISPLAY_SPELL_NAME = 0x20000000, // 29 spell name is displayed in cast bar instead of 'channeling' text SPELL_ATTR1_ENABLE_AT_DODGE = 0x40000000, // 30 Overpower, Wolverine Bite SPELL_ATTR1_UNK31 = 0x80000000 // 31 diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 51b0e86a2c3..926420b63e4 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -2141,7 +2141,7 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur) float angle, dist; float objSize = m_caster->GetObjectSize(); - if (m_spellInfo->AttributesEx & SPELL_ATTR1_USE_RADIUS_AS_MAX_DISTANCE) + if (cur == TARGET_MINION) dist = 0.0f; else dist = GetSpellRadiusForFriend(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[i])); |