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

Add spaces after commas

Browse Source
This commit is contained in:
leak
2011-04-29 20:47:02 +02:00
parent 01a79947d5
commit 1003f30448
645 changed files with 9439 additions and 9439 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/Auras/SpellAuras.cpp
+26 -26
View File
@@ -190,7 +190,7 @@ void AuraApplication::ClientUpdate(bool remove)
{
ASSERT(!m_target->GetVisibleAura(m_slot));
data << uint32(0);
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Aura %u removed slot %u",GetBase()->GetId(), m_slot);
sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Aura %u removed slot %u", GetBase()->GetId(), m_slot);
m_target->SendMessageToSet(&data, true);
return;
}
@@ -245,7 +245,7 @@ Aura * Aura::TryCreate(SpellEntry const* spellproto, uint8 tryEffMask, WorldObje
break;
}
if (uint8 realMask = effMask & tryEffMask)
return Create(spellproto,realMask,owner,caster,baseAmount,castItem,casterGUID);
return Create(spellproto, realMask, owner, caster, baseAmount, castItem, casterGUID);
return NULL;
}
@@ -276,7 +276,7 @@ Aura * Aura::TryCreate(SpellEntry const* spellproto, WorldObject * owner, Unit *
break;
}
if (effMask)
return Create(spellproto,effMask,owner,caster,baseAmount,castItem,casterGUID);
return Create(spellproto, effMask, owner, caster, baseAmount, castItem, casterGUID);
return NULL;
}
@@ -424,7 +424,7 @@ void Aura::_ApplyForTarget(Unit * target, Unit * caster, AuraApplication * auraA
if (m_spellProto->Attributes & SPELL_ATTR0_DISABLED_WHILE_ACTIVE)
{
Item* castItem = m_castItemGuid ? caster->ToPlayer()->GetItemByGuid(m_castItemGuid) : NULL;
caster->ToPlayer()->AddSpellAndCategoryCooldowns(m_spellProto,castItem ? castItem->GetEntry() : 0, NULL,true);
caster->ToPlayer()->AddSpellAndCategoryCooldowns(m_spellProto, castItem ? castItem->GetEntry() : 0, NULL, true);
}
}
}
@@ -902,18 +902,18 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
if (saBounds.first != saBounds.second)
{
uint32 zone, area;
target->GetZoneAndAreaId(zone,area);
target->GetZoneAndAreaId(zone, area);
for (SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr)
{
// some auras remove at aura remove
if (!itr->second->IsFitToRequirements((Player*)target,zone,area))
if (!itr->second->IsFitToRequirements((Player*)target, zone, area))
target->RemoveAurasDueToSpell(itr->second->spellId);
// some auras applied at aura apply
else if (itr->second->autocast)
{
if (!target->HasAura(itr->second->spellId))
target->CastSpell(target,itr->second->spellId,true);
target->CastSpell(target, itr->second->spellId, true);
}
}
}
@@ -978,9 +978,9 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
{
// Glyph of the Penguin
if (caster->HasAura(52648))
caster->CastSpell(target,61635,true);
caster->CastSpell(target, 61635, true);
else
caster->CastSpell(target,61634,true);
caster->CastSpell(target, 61634, true);
}
}
switch(GetId())
@@ -1026,7 +1026,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
if (target->GetTypeId() == TYPEID_PLAYER)
if (GameObject* obj = target->GetGameObject(48018))
{
target->ToPlayer()->TeleportTo(obj->GetMapId(),obj->GetPositionX(),obj->GetPositionY(),obj->GetPositionZ(),obj->GetOrientation());
target->ToPlayer()->TeleportTo(obj->GetMapId(), obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ(), obj->GetOrientation());
target->ToPlayer()->RemoveMovementImpairingAuras();
}
break;
@@ -1059,7 +1059,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
else if (m_spellProto->SpellFamilyFlags[0] & 0x1 && m_spellProto->SpellFamilyFlags[2] & 0x400 && GetEffect(0))
{
// Glyph of Power Word: Shield
if (AuraEffect* glyph = caster->GetAuraEffect(55672,0))
if (AuraEffect* glyph = caster->GetAuraEffect(55672, 0))
{
// instantly heal m_amount% of the absorb-value
int32 heal = glyph->GetAmount() * GetEffect(0)->GetAmount()/100;
@@ -1217,7 +1217,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
if (removeMode != AURA_REMOVE_BY_DEFAULT)
{
// Improved Spell Reflection
if (caster->GetDummyAuraEffect(SPELLFAMILY_WARRIOR,1935, 1))
if (caster->GetDummyAuraEffect(SPELLFAMILY_WARRIOR, 1935, 1))
{
// aura remove - remove auras from all party members
std::list<Unit*> PartyMembers;
@@ -1413,7 +1413,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
if (apply)
target->CastSpell(caster, 59665, true, 0, 0, caster->GetGUID());
else
target->SetReducedThreatPercent(0,0);
target->SetReducedThreatPercent(0, 0);
break;
}
break;
@@ -1425,20 +1425,20 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
if (AuraEffect const * aurEff = target->GetAuraEffectOfRankedSpell(31221, 0))
{
if (!apply)
target->CastSpell(target,31666,true);
target->CastSpell(target, 31666, true);
else
{
int32 basepoints0 = aurEff->GetAmount();
target->CastCustomSpell(target,31665, &basepoints0, NULL, NULL ,true);
target->CastCustomSpell(target, 31665, &basepoints0, NULL, NULL , true);
}
}
// Overkill
if (target->HasAura(58426))
{
if (!apply)
target->CastSpell(target,58428,true);
target->CastSpell(target, 58428, true);
else
target->CastSpell(target,58427,true);
target->CastSpell(target, 58427, true);
}
break;
}
@@ -1477,7 +1477,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
if (apply)
{
if ((GetSpellProto()->Id == 31821 && target->HasAura(19746, GetCasterGUID())) || (GetSpellProto()->Id == 19746 && target->HasAura(31821)))
target->CastSpell(target,64364,true);
target->CastSpell(target, 64364, true);
}
else
target->RemoveAurasDueToSpell(64364, GetCasterGUID());
@@ -1530,7 +1530,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
else if (bloodPresenceAura)
{
int32 basePoints1=bloodPresenceAura->GetAmount();
target->CastCustomSpell(target,63611,NULL,&basePoints1,NULL,true,0,bloodPresenceAura);
target->CastCustomSpell(target, 63611, NULL, &basePoints1, NULL, true, 0, bloodPresenceAura);
}
// Frost Presence bonus
if (presence == 48263)
@@ -1538,7 +1538,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
else if (frostPresenceAura)
{
int32 basePoints0=frostPresenceAura->GetAmount();
target->CastCustomSpell(target,61261,&basePoints0,NULL,NULL,true,0,frostPresenceAura);
target->CastCustomSpell(target, 61261, &basePoints0, NULL, NULL, true, 0, frostPresenceAura);
}
// Unholy Presence bonus
if (presence == 48265)
@@ -1547,15 +1547,15 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
{
// Not listed as any effect, only base points set
int32 basePoints0 = SpellMgr::CalculateSpellEffectAmount(unholyPresenceAura->GetSpellProto(), 1);
target->CastCustomSpell(target,63622,&basePoints0 ,&basePoints0,&basePoints0,true,0,unholyPresenceAura);
target->CastCustomSpell(target,65095,&basePoints0 ,NULL,NULL,true,0,unholyPresenceAura);
target->CastCustomSpell(target, 63622, &basePoints0 , &basePoints0, &basePoints0, true, 0, unholyPresenceAura);
target->CastCustomSpell(target, 65095, &basePoints0 , NULL, NULL, true, 0, unholyPresenceAura);
}
target->CastSpell(target,49772, true);
target->CastSpell(target, 49772, true);
}
else if (unholyPresenceAura)
{
int32 basePoints0=unholyPresenceAura->GetAmount();
target->CastCustomSpell(target,49772,&basePoints0,NULL,NULL,true,0,unholyPresenceAura);
target->CastCustomSpell(target, 49772, &basePoints0, NULL, NULL, true, 0, unholyPresenceAura);
}
}
else
@@ -1880,7 +1880,7 @@ void UnitAura::_ApplyForTarget(Unit * target, Unit * caster, AuraApplication * a
// register aura diminishing on apply
if (DiminishingGroup group = GetDiminishGroup())
target->ApplyDiminishingAura(group,true);
target->ApplyDiminishingAura(group, true);
}
void UnitAura::_UnapplyForTarget(Unit * target, Unit * caster, AuraApplication * aurApp)
@@ -1889,7 +1889,7 @@ void UnitAura::_UnapplyForTarget(Unit * target, Unit * caster, AuraApplication *
// unregister aura diminishing (and store last time)
if (DiminishingGroup group = GetDiminishGroup())
target->ApplyDiminishingAura(group,false);
target->ApplyDiminishingAura(group, false);
}
void UnitAura::Remove(AuraRemoveMode removeMode)