diff options
| author | Machiavelli <none@none> | 2009-06-11 20:59:26 +0200 |
|---|---|---|
| committer | Machiavelli <none@none> | 2009-06-11 20:59:26 +0200 |
| commit | 6d5d23faf6453539cecddea6a4d497ad35aa5b4a (patch) | |
| tree | dbecbd31b48cdd164ad31caf76a00533c265feae /src | |
| parent | 54870e2d7964c93c9c643d94dbb894af54cd0732 (diff) | |
| parent | e82ae5f8df582f896adfb3d3c5a0edb187a3946e (diff) | |
Merge
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Spell.cpp | 3 | ||||
| -rw-r--r-- | src/game/SpellMgr.cpp | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index db3d05036f6..4cd3a5d298a 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -2021,8 +2021,7 @@ void Spell::SetTargetMap(uint32 i, uint32 cur) float range = GetSpellMaxRange(m_spellInfo, IsPositiveSpell(m_spellInfo->Id)); if(modOwner) modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RANGE, range, this); - WorldObject *target = SearchNearbyTarget(range, SPELL_TARGETS_ENTRY); - if(target) + if(WorldObject *target = SearchNearbyTarget(range, SPELL_TARGETS_ENTRY)) m_targets.setDestination(target); break; } diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 9901b0fe7af..67f31ad7759 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -3325,6 +3325,11 @@ void SpellMgr::LoadSpellCustomAttr() switch(i) { + case 16007: // Draco-Incarcinatrix 900 + // was 46, but effect is aura effect + spellInfo->EffectImplicitTargetA[0] = TARGET_UNIT_NEARBY_ENTRY; + spellInfo->EffectImplicitTargetB[0] = TARGET_DST_NEARBY_ENTRY; + break; case 26029: // dark glare case 37433: // spout case 43140: case 43215: // flame breath |