mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 310

Browse source 
Conflicts:
	src/game/MiscHandler.cpp
	src/game/Player.cpp
	src/game/Player.h
	src/shared/Database/DBCStores.cpp
This commit is contained in:
tomrus88 2009-03-22 09:41:17 +03:00
commit 9debf4dfc0
15 changed files with 182 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/game/Spell.cpp
View file

@ -1326,6 +1326,19 @@ void Spell::SetTargetMap(uint32 i,uint32 cur,std::list<Unit*> &TagUnitMap)
// Get spell max affected targets
uint32 unMaxTargets = m_spellInfo->MaxAffectedTargets;
// custom target amount cases
switch(m_spellInfo->SpellFamilyName)
{
case SPELLFAMILY_DRUID:
// Starfall
if (m_spellInfo->SpellFamilyFlags2 & 0x00000100LL)
unMaxTargets = 2;
break;
default:
break;
}
Unit::AuraList const& mod = m_caster->GetAurasByType(SPELL_AURA_MOD_MAX_AFFECTED_TARGETS);
for(Unit::AuraList::const_iterator m = mod.begin(); m != mod.end(); ++m)
{
@ -1333,6 +1346,7 @@ void Spell::SetTargetMap(uint32 i,uint32 cur,std::list<Unit*> &TagUnitMap)
continue;
unMaxTargets+=(*m)->GetModifier()->m_amount;
}
switch(cur)
{
case TARGET_TOTEM_EARTH: