diff options
| author | Spp <spp@jorge.gr> | 2013-01-03 09:17:53 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2013-01-03 09:17:53 +0100 |
| commit | d35d33aa86443f6bdde75a5923fcde8f3eb979e9 (patch) | |
| tree | a4b16a6d5f99d6a3cbec6714f8154f12858ff48d /src/server/game/Spells/Spell.cpp | |
| parent | 6b668c8337d2efe306ad4c5a1d0ade6e34b5d66d (diff) | |
| parent | 27b1e457e6b002ad52fd44b78f51358ae058323a (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/Entities/Object/ObjectDefines.h
src/server/scripts/EasternKingdoms/CMakeLists.txt
src/server/scripts/Kalimdor/CMakeLists.txt
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 534a8a4b6af..6f29caeeee4 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -823,10 +823,10 @@ void Spell::SelectEffectImplicitTargets(SpellEffIndex effIndex, SpellImplicitTar for (uint32 j = effIndex + 1; j < MAX_SPELL_EFFECTS; ++j) { SpellEffectInfo const* effects = GetSpellInfo()->Effects; - if (effects[effIndex].TargetA.GetTarget() == effects[j].TargetA.GetTarget() - && effects[effIndex].TargetB.GetTarget() == effects[j].TargetB.GetTarget() - && effects[effIndex].ImplicitTargetConditions == effects[j].ImplicitTargetConditions - && effects[effIndex].CalcRadius(m_caster) == effects[j].CalcRadius(m_caster)) + if (effects[effIndex].TargetA.GetTarget() == effects[j].TargetA.GetTarget() && + effects[effIndex].TargetB.GetTarget() == effects[j].TargetB.GetTarget() && + effects[effIndex].ImplicitTargetConditions == effects[j].ImplicitTargetConditions && + effects[effIndex].CalcRadius(m_caster) == effects[j].CalcRadius(m_caster)) { effectMask |= 1 << j; } |