josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Add some removed part in settargetmap in last merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-05-02 15:49:35 -05:00
parent fa46340b9a
commit 823cb628be
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Spell.cpp
+9 -4
View File
@@ -1684,12 +1684,10 @@ void Spell::SetTargetMap(uint32 i, uint32 cur)
} }
case TARGET_TYPE_AREA_SRC: case TARGET_TYPE_AREA_SRC:
CheckSrc();
pushType = PUSH_SRC_CENTER; pushType = PUSH_SRC_CENTER;
break; break;
case TARGET_TYPE_AREA_DST: case TARGET_TYPE_AREA_DST:
CheckDst();
pushType = PUSH_DST_CENTER; pushType = PUSH_DST_CENTER;
break; break;
@@ -1997,6 +1995,7 @@ void Spell::SetTargetMap(uint32 i, uint32 cur)
if(modOwner) if(modOwner)
modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RADIUS, radius, this); modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RADIUS, radius, this);
radius *= m_spellValue->RadiusMod;
std::list<Unit*> unitList; std::list<Unit*> unitList;
if(targetType == SPELL_TARGETS_ENTRY) if(targetType == SPELL_TARGETS_ENTRY)
@@ -2074,11 +2073,17 @@ void Spell::SetTargetMap(uint32 i, uint32 cur)
if(!unitList.empty()) if(!unitList.empty())
{ {
if(m_spellValue->MaxAffectedTargets) if(uint32 maxTargets = m_spellValue->MaxAffectedTargets)
{ {
Unit::AuraEffectList const& Auras = m_caster->GetAurasByType(SPELL_AURA_MOD_MAX_AFFECTED_TARGETS);
for(Unit::AuraEffectList::const_iterator j = Auras.begin();j != Auras.end(); ++j)
if((*j)->isAffectedOnSpell(m_spellInfo))
maxTargets += (*j)->GetAmount();
if(m_spellInfo->Id == 5246) //Intimidating Shout if(m_spellInfo->Id == 5246) //Intimidating Shout
unitList.remove(m_targets.getUnitTarget()); unitList.remove(m_targets.getUnitTarget());
Trinity::RandomResizeList(unitList, m_spellValue->MaxAffectedTargets);
Trinity::RandomResizeList(unitList, maxTargets);
} }
for(std::list<Unit*>::iterator itr = unitList.begin(); itr != unitList.end(); ++itr) for(std::list<Unit*>::iterator itr = unitList.begin(); itr != unitList.end(); ++itr)