From 0096bf6ebb192dd1436d5ea8c5dd8b2b25d2da8d Mon Sep 17 00:00:00 2001 From: Lynx3d Date: Wed, 7 Jul 2010 19:30:22 +0200 Subject: [PATCH] [10157] Fix makefile and make gcc happy. --- src/game/Makefile.am | 1 + src/game/SpellEffects.cpp | 14 +++++++------- src/shared/revision_nr.h | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/game/Makefile.am b/src/game/Makefile.am index 575b4c04b..1008833f7 100644 --- a/src/game/Makefile.am +++ b/src/game/Makefile.am @@ -271,6 +271,7 @@ libmangosgame_a_SOURCES = \ Traveller.h \ Unit.cpp \ Unit.h \ + UnitAuraProcHandler.cpp \ UnitEvents.h \ UpdateData.cpp \ UpdateData.h \ diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index d697e4349..92f4de4b0 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -3188,7 +3188,7 @@ void Spell::EffectHeal(SpellEffectIndex /*eff_idx*/) addhealth += tickheal * tickcount; } - + // Chain Healing if (m_spellInfo->SpellFamilyName == SPELLFAMILY_SHAMAN && m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000000100)) { @@ -3221,7 +3221,7 @@ void Spell::EffectHealPct(SpellEffectIndex /*eff_idx*/) return; uint32 addhealth = unitTarget->GetMaxHealth() * damage / 100; - + addhealth = caster->SpellHealingBonusDone(unitTarget, m_spellInfo, addhealth, HEAL); addhealth = unitTarget->SpellHealingBonusTaken(caster, m_spellInfo, addhealth, HEAL); @@ -4043,8 +4043,8 @@ void Spell::EffectDispel(SpellEffectIndex eff_idx) return; // Fill possible dispell list - std::list > dispel_list; - + std::list > dispel_list; + // Create dispel mask by dispel type uint32 dispel_type = m_spellInfo->EffectMiscValue[eff_idx]; uint32 dispelMask = GetDispellMask( DispelType(dispel_type) ); @@ -4084,7 +4084,7 @@ void Spell::EffectDispel(SpellEffectIndex eff_idx) for (int32 count=0; count < damage && !dispel_list.empty(); ++count) { // Random select buff for dispel - std::list>::iterator dispel_itr = dispel_list.begin(); + std::list >::iterator dispel_itr = dispel_list.begin(); std::advance(dispel_itr,urand(0, dispel_list.size()-1)); SpellAuraHolder *holder = dispel_itr->first; @@ -6266,7 +6266,7 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx) holder->RefreshHolder(); Aura *aura = holder->GetAuraByEffectIndex(EFFECT_INDEX_0); - + if (!aura) continue; @@ -7665,7 +7665,7 @@ void Spell::EffectStealBeneficialBuff(SpellEffectIndex eff_idx) if(!unitTarget || unitTarget==m_caster) // can't steal from self return; - + std::vector steal_list; // Create dispel mask by dispel type uint32 dispelMask = GetDispellMask( DispelType(m_spellInfo->EffectMiscValue[eff_idx]) ); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index bebb302eb..9ff8167ef 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10156" + #define REVISION_NR "10157" #endif // __REVISION_NR_H__