Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 19:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Machiavelli
2009-06-11 20:59:26 +02:00
parent 54870e2d79 e82ae5f8df
commit 6d5d23faf6
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/game/Spell.cpp
View File

@@ -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;
}

5
src/game/SpellMgr.cpp
View File

@@ -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