aboutsummaryrefslogtreecommitdiff
path: root/src/game/Spell.cpp
diff options
context:
space:
mode:
authorQAston <none@none>2010-02-04 00:36:40 +0100
committerQAston <none@none>2010-02-04 00:36:40 +0100
commit6ec51e7bbc06a3aca32417ed9680661de3ae6731 (patch)
tree7ade698793df534157701f9c9bab57aae6c0d183 /src/game/Spell.cpp
parentb1cc10aaf0ab8dde7c90fc29a1c79ad0baee6f43 (diff)
*Implement spell target type TARGET_GAMEOBJECT_NEARBY_ENTRY
--HG-- branch : trunk
Diffstat (limited to 'src/game/Spell.cpp')
-rw-r--r--src/game/Spell.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index add99c25795..6cbb9b16e48 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -1754,8 +1754,8 @@ WorldObject* Spell::SearchNearbyTarget(float range, SpellTargets TargetType)
if ((*itr)->GetEntry() == i_spellST->second.targetEntry && (*itr)->IsWithinDistInMap(m_caster, range))
{
goScriptTarget = NULL;
- range = m_caster->GetDistance(creatureScriptTarget);
creatureScriptTarget = ((Creature *)*itr);
+ range = m_caster->GetDistance(creatureScriptTarget);
}
break;
case SPELL_TARGET_TYPE_GAMEOBJECT:
@@ -1941,6 +1941,7 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
target = SearchNearbyTarget(range, SPELL_TARGETS_ALLY);
break;
case TARGET_UNIT_NEARBY_ENTRY:
+ case TARGET_GAMEOBJECT_NEARBY_ENTRY:
range = GetSpellMaxRange(m_spellInfo, IsPositiveSpell(m_spellInfo->Id));
if(modOwner) modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RANGE, range, this);
target = SearchNearbyTarget(range, SPELL_TARGETS_ENTRY);
@@ -2180,7 +2181,6 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
switch (cur)
{
case TARGET_GAMEOBJECT:
- case TARGET_OBJECT_USE:
if(m_targets.getGOTarget())
AddGOTarget(m_targets.getGOTarget(), i);
break;