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

[10157] Fix makefile and make gcc happy.

Browse source
This commit is contained in:
Lynx3d 2010-07-07 19:30:22 +02:00
parent a32b3063a2
commit 0096bf6ebb
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/game/Makefile.am
View file

@ -271,6 +271,7 @@ libmangosgame_a_SOURCES = \
Traveller.h \
Unit.cpp \
Unit.h \
UnitAuraProcHandler.cpp \
UnitEvents.h \
UpdateData.cpp \
UpdateData.h \

14
src/game/SpellEffects.cpp
View file

@ -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 <std::pair<SpellAuraHolder* ,uint32>> dispel_list;
std::list <std::pair<SpellAuraHolder* ,uint32> > 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<std::pair<SpellAuraHolder* ,uint32>>::iterator dispel_itr = dispel_list.begin();
std::list<std::pair<SpellAuraHolder* ,uint32> >::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 <SpellAuraHolder *> steal_list;
// Create dispel mask by dispel type
uint32 dispelMask = GetDispellMask( DispelType(m_spellInfo->EffectMiscValue[eff_idx]) );

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "10156"
#define REVISION_NR "10157"
#endif // __REVISION_NR_H__