diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 52e9a641a..493d28f93 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -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); } -} \ No newline at end of file +} diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index e4b1b045a..a4f009048 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 "9668" + #define REVISION_NR "9669" #endif // __REVISION_NR_H__