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

[9669] Restore build at some old GCC versions

Browse source 
Old GCC hash_map::erase not return next iterator point

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
Laise 2010-04-03 23:06:16 +04:00 • committed by VladimirMangos
parent 9883ee496d
commit 7cb0edc272
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/game/Player.cpp
View file

@ -2038,7 +2038,7 @@ void Player::Regenerate(Powers power, uint32 diff)
AuraList const& ModPowerRegenPCTAuras = GetAurasByType(SPELL_AURA_MOD_POWER_REGEN_PERCENT); AuraList const& ModPowerRegenPCTAuras = GetAurasByType(SPELL_AURA_MOD_POWER_REGEN_PERCENT);
for(AuraList::const_iterator i = ModPowerRegenPCTAuras.begin(); i != ModPowerRegenPCTAuras.end(); ++i) for(AuraList::const_iterator i = ModPowerRegenPCTAuras.begin(); i != ModPowerRegenPCTAuras.end(); ++i)
if ((*i)->GetModifier()->m_miscvalue == power && (*i)->GetMiscBValue()==GetCurrentRune(rune)) if ((*i)->GetModifier()->m_miscvalue == power && (*i)->GetMiscBValue()==GetCurrentRune(rune))
cd_diff = cd_diff * ((*i)->GetModifier()->m_amount + 100) / 100.0f; cd_diff = cd_diff * ((*i)->GetModifier()->m_amount + 100) / 100;
SetRuneCooldown(rune, (cd < cd_diff) ? 0 : cd - cd_diff); SetRuneCooldown(rune, (cd < cd_diff) ? 0 : cd - cd_diff);
} }
@ -3686,7 +3686,7 @@ bool Player::resetTalents(bool no_cost)
TalentEntry const *talentInfo = (*iter).second.m_talentEntry; TalentEntry const *talentInfo = (*iter).second.m_talentEntry;
if (!talentInfo) if (!talentInfo)
{ {
iter = m_talents[m_activeSpec].erase(iter); m_talents[m_activeSpec].erase(iter++);
continue; continue;
} }
@ -3694,7 +3694,7 @@ bool Player::resetTalents(bool no_cost)
if (!talentTabInfo) if (!talentTabInfo)
{ {
iter = m_talents[m_activeSpec].erase(iter); m_talents[m_activeSpec].erase(iter++);
continue; continue;
} }
@ -21841,4 +21841,4 @@ void Player::SetRestType( RestType n_r_type, uint32 areaTriggerId /*= 0*/)
if(sWorld.IsFFAPvPRealm()) if(sWorld.IsFFAPvPRealm())
SetFFAPvP(false); SetFFAPvP(false);
} }
} }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9668" #define REVISION_NR "9669"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__