Core/Spells: Drop EFFECT_IMPLICIT_TARGET_PET and use EFFECT_IMPLICIT_TARGET_EXPLICIT instead.

This commit is contained in:
QAston committed 2011-09-24 02:02:39 +02:00
1 parent 71bbbaa21b
commit d01a761f53
4 files changed
+31 -31

No files matched your search

+10 -11
View File
@@ -3091,13 +3091,12 @@ void Spell::EffectLearnSpell(SpellEffIndex effIndex)
if (unitTarget->GetTypeId() != TYPEID_PLAYER)
{
if (m_caster->GetTypeId() == TYPEID_PLAYER)
if (unitTarget->ToPet())
EffectLearnPetSpell(effIndex);
return;
}
Player* player = (Player*)unitTarget;
Player* player = unitTarget->ToPlayer();
uint32 spellToLearn = (m_spellInfo->Id == 483 || m_spellInfo->Id == 55884) ? damage : m_spellInfo->Effects[effIndex].TriggerSpell;
player->learnSpell(spellToLearn, false);
@@ -3782,25 +3781,25 @@ void Spell::EffectSummonPet(SpellEffIndex effIndex)
void Spell::EffectLearnPetSpell(SpellEffIndex effIndex)
{
if (m_caster->GetTypeId() != TYPEID_PLAYER)
if (!unitTarget)
return;
Player* _player = m_caster->ToPlayer();
Pet* pet = _player->GetPet();
if (unitTarget->ToPlayer())
{
EffectLearnSpell(effIndex);
return;
}
Pet* pet = unitTarget->ToPet();
if (!pet)
return;
if (!pet->isAlive())
return;
SpellInfo const* learn_spellproto = sSpellMgr->GetSpellInfo(m_spellInfo->Effects[effIndex].TriggerSpell);
if (!learn_spellproto)
return;
pet->learnSpell(learn_spellproto->Id);
pet->SavePetToDB(PET_SAVE_AS_CURRENT);
_player->PetSpellInitialize();
pet->GetOwner()->PetSpellInitialize();
}
void Spell::EffectTaunt(SpellEffIndex /*effIndex*/)