mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-21 17:54:48 +01:00
*Merge to Trinity 673.
--HG-- branch : trunk
This commit is contained in:
@@ -73,6 +73,14 @@ SpellMgr::SpellMgr()
|
||||
case SPELL_EFFECT_PROSPECTING:
|
||||
EffectTargetType[i] = SPELL_REQUIRE_ITEM;
|
||||
break;
|
||||
//caster must be pushed otherwise no sound
|
||||
case SPELL_EFFECT_APPLY_AREA_AURA_PARTY:
|
||||
case SPELL_EFFECT_APPLY_AREA_AURA_FRIEND:
|
||||
case SPELL_EFFECT_APPLY_AREA_AURA_ENEMY:
|
||||
case SPELL_EFFECT_APPLY_AREA_AURA_PET:
|
||||
case SPELL_EFFECT_APPLY_AREA_AURA_OWNER:
|
||||
EffectTargetType[i] = SPELL_REQUIRE_CASTER;
|
||||
break;
|
||||
default:
|
||||
EffectTargetType[i] = SPELL_REQUIRE_UNIT;
|
||||
break;
|
||||
@@ -113,7 +121,8 @@ SpellMgr::SpellMgr()
|
||||
case TARGET_UNIT_AREA_ENTRY:
|
||||
case TARGET_UNIT_AREA_PARTY_GROUND:
|
||||
case TARGET_UNIT_AREA_PARTY:
|
||||
case TARGET_UNIT_AREA_ENEMY_CHANNEL:
|
||||
//case TARGET_UNIT_AREA_ENEMY_CHANNEL:
|
||||
//case TARGET_UNIT_AREA_ALLY_CHANNEL:
|
||||
SpellTargetType[i] = TARGET_TYPE_AREA_DEST;
|
||||
break;
|
||||
case TARGET_DEST_TARGET_ENEMY:
|
||||
@@ -151,6 +160,35 @@ SpellMgr::SpellMgr()
|
||||
SpellTargetType[i] = TARGET_TYPE_DEFAULT;
|
||||
}
|
||||
}
|
||||
|
||||
for(int i = 0; i < TOTAL_SPELL_TARGETS; ++i)
|
||||
{
|
||||
switch(i)
|
||||
{
|
||||
case TARGET_UNIT_AREA_ENEMY_GROUND:
|
||||
case TARGET_UNIT_AREA_ENEMY:
|
||||
case TARGET_UNIT_AREA_ALLY_GROUND:
|
||||
case TARGET_UNIT_AREA_ALLY:
|
||||
case TARGET_UNIT_AREA_ENTRY_GROUND:
|
||||
case TARGET_UNIT_AREA_ENTRY:
|
||||
case TARGET_UNIT_AREA_PARTY_GROUND:
|
||||
case TARGET_UNIT_AREA_PARTY:
|
||||
//Check persistant aura seperately
|
||||
//case TARGET_UNIT_AREA_ENEMY_CHANNEL:
|
||||
//case TARGET_UNIT_AREA_ALLY_CHANNEL:
|
||||
case TARGET_UNIT_PARTY_TARGET:
|
||||
case TARGET_UNIT_PARTY_CASTER:
|
||||
case TARGET_UNIT_CONE_ENEMY:
|
||||
case TARGET_UNIT_CONE_ALLY:
|
||||
case TARGET_UNIT_CONE_ENEMY_UNKNOWN:
|
||||
case TARGET_UNIT_RAID:
|
||||
IsAreaEffectTarget[i] = true;
|
||||
break;
|
||||
default:
|
||||
IsAreaEffectTarget[i] = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
SpellMgr::~SpellMgr()
|
||||
|
||||
Reference in New Issue
Block a user