diff options
| author | XTZGZoReX <none@none> | 2009-03-20 15:17:58 +0100 |
|---|---|---|
| committer | XTZGZoReX <none@none> | 2009-03-20 15:17:58 +0100 |
| commit | d1adac0d11847c893b2df0778b81dbbbb79b20ee (patch) | |
| tree | bef465fd25746ed1e276ede2238f155b1a347a4a /src/game/Spell.cpp | |
| parent | 3c713189fb6ac6666e6d8e7faa2e1fec6b425725 (diff) | |
| parent | 4d7ee8208e0e1762ca70d1cee253e51d3c517551 (diff) | |
* Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Spell.cpp')
| -rw-r--r-- | src/game/Spell.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 3dd11e105c3..881a68e6c19 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -1524,7 +1524,6 @@ void Spell::SetTargetMap(uint32 i,uint32 cur,std::list<Unit*> &TagUnitMap) // TagUnitMap.push_back(target); //else m_caster->GetRaidMember(TagUnitMap, radius_f); - TagUnitMap.push_back(m_caster); break; } }break; @@ -1541,7 +1540,7 @@ void Spell::SetTargetMap(uint32 i,uint32 cur,std::list<Unit*> &TagUnitMap) switch(cur) { case TARGET_UNIT_MINIPET: - if( target->GetTypeId() == TYPEID_UNIT && ((Creature*)target)->isPet() && ((Pet*)target)->getPetType() == MINI_PET) + if(target->GetGUID() == m_caster->m_TotemSlot[4]) TagUnitMap.push_back(target); break; case TARGET_UNIT_TARGET_ALLY: @@ -4172,9 +4171,9 @@ SpellCastResult Spell::CheckCast(bool strict) SummonPropertiesEntry const *SummonProperties = sSummonPropertiesStore.LookupEntry(m_spellInfo->EffectMiscValueB[i]); if(!SummonProperties) break; - switch(SummonProperties->Group) + switch(SummonProperties->Category) { - case SUMMON_TYPE_POSSESSED: + case SUMMON_CATEGORY_POSSESSED: { if(m_caster->GetPetGUID()) return SPELL_FAILED_ALREADY_HAVE_SUMMON; |