From e79d46e499a4602e2ebc5ebb058fc056ecffe2bb Mon Sep 17 00:00:00 2001 From: QAston Date: Thu, 30 Jun 2011 00:49:10 +0200 Subject: Core/Spells: Correctly define TARGET_UNIT_NEARBY_PARTY(3) and TARGET_UNIT_NEARBY_ALLY(4) target types. --- src/server/game/Miscellaneous/SharedDefines.h | 4 ++-- src/server/game/Spells/Spell.cpp | 2 +- src/server/game/Spells/SpellMgr.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 98fc0869526..b867e232cbc 100755 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -1281,8 +1281,8 @@ enum Targets { TARGET_UNIT_CASTER = 1, TARGET_UNIT_NEARBY_ENEMY = 2, - TARGET_UNIT_NEARBY_ALLY = 3, - TARGET_UNIT_NEARBY_ALLY_UNK = 4, + TARGET_UNIT_NEARBY_PARTY = 3, + TARGET_UNIT_NEARBY_ALLY = 4, TARGET_UNIT_PET = 5, TARGET_UNIT_TARGET_ENEMY = 6, TARGET_UNIT_AREA_ENTRY_SRC = 7, diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 797a8ecfcbe..50bb1ba1133 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -2080,7 +2080,7 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur) target = SearchNearbyTarget(range, SPELL_TARGETS_ENEMY, SpellEffIndex(i)); break; case TARGET_UNIT_NEARBY_ALLY: - case TARGET_UNIT_NEARBY_ALLY_UNK: + case TARGET_UNIT_NEARBY_PARTY: // TODO: fix party/raid targets case TARGET_UNIT_NEARBY_RAID: range = GetSpellMaxRange(m_spellInfo, true); if (modOwner) modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RANGE, range, this); diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 96b37beb641..0c014509804 100755 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -134,8 +134,8 @@ SpellMgr::SpellMgr() break; case TARGET_UNIT_NEARBY_ENEMY: case TARGET_UNIT_NEARBY_ALLY: - case TARGET_UNIT_NEARBY_ALLY_UNK: case TARGET_UNIT_NEARBY_ENTRY: + case TARGET_UNIT_NEARBY_PARTY: case TARGET_UNIT_NEARBY_RAID: case TARGET_GAMEOBJECT_NEARBY_ENTRY: SpellTargetType[i] = TARGET_TYPE_UNIT_NEARBY; -- cgit v1.2.3