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

Backports from 400 branch.

Browse source
This commit is contained in:
tomrus88 2010-11-15 18:01:45 +03:00
parent bf774f49ce
commit 76dfdd336f
32 changed files with 223 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/game/SpellEffects.cpp
View file

@ -4261,7 +4261,7 @@ void Spell::EffectDispel(SpellEffectIndex eff_idx)
if (!unitTarget)
return;
// Fill possible dispell list
// Fill possible dispel list
std::list <std::pair<SpellAuraHolder* ,uint32> > dispel_list;
// Create dispel mask by dispel type
@ -4304,7 +4304,7 @@ void Spell::EffectDispel(SpellEffectIndex eff_idx)
if(!damage)
damage = 1;
// Dispell N = damage buffs (or while exist buffs for dispel)
// Dispel N = damage buffs (or while exist buffs for dispel)
for (int32 count=0; count < damage && !dispel_list.empty(); ++count)
{
// Random select buff for dispel
@ -4362,7 +4362,7 @@ void Spell::EffectDispel(SpellEffectIndex eff_idx)
{
SpellAuraHolder* dispelledHolder = j->first;
data << uint32(dispelledHolder->GetId()); // Spell Id
data << uint8(0); // 0 - dispeled !=0 cleansed
data << uint8(0); // 0 - dispelled !=0 cleansed
unitTarget->RemoveAuraHolderDueToSpellByDispel(dispelledHolder->GetId(), j->second, dispelledHolder->GetCasterGUID(), m_caster);
}
m_caster->SendMessageToSet(&data, true);
@ -4378,11 +4378,11 @@ void Spell::EffectDispel(SpellEffectIndex eff_idx)
// Send fail log to client
if (!fail_list.empty())
{
// Failed to dispell
// Failed to dispel
WorldPacket data(SMSG_DISPEL_FAILED, 8+8+4+4*fail_list.size());
data << m_caster->GetObjectGuid(); // Caster GUID
data << unitTarget->GetObjectGuid(); // Victim GUID
data << uint32(m_spellInfo->Id); // Dispell spell id
data << uint32(m_spellInfo->Id); // Dispel spell id
for (std::list< uint32 >::iterator j = fail_list.begin(); j != fail_list.end(); ++j)
data << uint32(*j); // Spell Id
m_caster->SendMessageToSet(&data, true);
@ -5199,6 +5199,7 @@ void Spell::EffectWeaponDmg(SpellEffectIndex eff_idx)
bool normalized = false;
int32 spell_bonus = 0; // bonus specific for spell
switch(m_spellInfo->SpellFamilyName)
{
case SPELLFAMILY_GENERIC: