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

Merge remote branch 'origin/master' into 330

Browse source
This commit is contained in:
tomrus88 2010-04-04 15:50:18 +04:00
commit 9a0545cd05
6 changed files with 60 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/game/Player.cpp
View file

@ -2053,7 +2053,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);
}
@ -3702,7 +3702,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;
}
@ -3710,7 +3710,7 @@ bool Player::resetTalents(bool no_cost)
if (!talentTabInfo)
{
iter = m_talents[m_activeSpec].erase(iter);
m_talents[m_activeSpec].erase(iter++);
continue;
}
@ -14870,7 +14870,11 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
SetArenaTeamInfoField(arena_slot, ArenaTeamInfoType(j), 0);
}
SetUInt32Value(PLAYER_FIELD_HONOR_CURRENCY, fields[40].GetUInt32());
uint32 honor_currency = fields[40].GetUInt32();
if (honor_currency > sWorld.getConfig(CONFIG_UINT32_MAX_HONOR_POINTS))
honor_currency = sWorld.getConfig(CONFIG_UINT32_MAX_HONOR_POINTS);
SetUInt32Value(PLAYER_FIELD_HONOR_CURRENCY, honor_currency);
SetUInt32Value(PLAYER_FIELD_TODAY_CONTRIBUTION, fields[41].GetUInt32());
SetUInt32Value(PLAYER_FIELD_YESTERDAY_CONTRIBUTION, fields[42].GetUInt32());
SetUInt32Value(PLAYER_FIELD_LIFETIME_HONORBALE_KILLS, fields[43].GetUInt32());
@ -21884,4 +21888,4 @@ void Player::SetRestType( RestType n_r_type, uint32 areaTriggerId /*= 0*/)
if(sWorld.IsFFAPvPRealm())
SetFFAPvP(false);
}
}
}