mirror of
https://github.com/mangosfour/server.git
synced 2025-12-14 16:37:01 +00:00
[9669] Restore build at some old GCC versions
Old GCC hash_map::erase not return next iterator point Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
parent
9883ee496d
commit
7cb0edc272
2 changed files with 5 additions and 5 deletions
|
|
@ -2038,7 +2038,7 @@ void Player::Regenerate(Powers power, uint32 diff)
|
|||
AuraList const& ModPowerRegenPCTAuras = GetAurasByType(SPELL_AURA_MOD_POWER_REGEN_PERCENT);
|
||||
for(AuraList::const_iterator i = ModPowerRegenPCTAuras.begin(); i != ModPowerRegenPCTAuras.end(); ++i)
|
||||
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);
|
||||
}
|
||||
|
|
@ -3686,7 +3686,7 @@ bool Player::resetTalents(bool no_cost)
|
|||
TalentEntry const *talentInfo = (*iter).second.m_talentEntry;
|
||||
if (!talentInfo)
|
||||
{
|
||||
iter = m_talents[m_activeSpec].erase(iter);
|
||||
m_talents[m_activeSpec].erase(iter++);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
@ -3694,7 +3694,7 @@ bool Player::resetTalents(bool no_cost)
|
|||
|
||||
if (!talentTabInfo)
|
||||
{
|
||||
iter = m_talents[m_activeSpec].erase(iter);
|
||||
m_talents[m_activeSpec].erase(iter++);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
@ -21841,4 +21841,4 @@ void Player::SetRestType( RestType n_r_type, uint32 areaTriggerId /*= 0*/)
|
|||
if(sWorld.IsFFAPvPRealm())
|
||||
SetFFAPvP(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue