diff options
Diffstat (limited to 'src/game/Player.cpp')
| -rw-r--r-- | src/game/Player.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 329e605ec0e..677114a6c87 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -6163,7 +6163,7 @@ int32 Player::CalculateReputationGain(uint32 creatureOrQuestLevel, int32 rep, in float rate = for_quest ? sWorld.getRate(RATE_REPUTATION_LOWLEVEL_QUEST) : sWorld.getRate(RATE_REPUTATION_LOWLEVEL_KILL); - if (rate != 1.0f && creatureOrQuestLevel <= MaNGOS::XP::GetGrayLevel(getLevel())) + if (rate != 1.0f && creatureOrQuestLevel <= Trinity::XP::GetGrayLevel(getLevel())) percent *= rate; float repMod = GetTotalAuraModifier(SPELL_AURA_MOD_REPUTATION_GAIN); @@ -13717,7 +13717,7 @@ void Player::RewardQuest( Quest const *pQuest, uint32 reward, Object* questGiver // honor reward if (pQuest->GetRewHonorableKills()) - RewardHonor(NULL, 0, MaNGOS::Honor::hk_honor_at_level(getLevel(), pQuest->GetRewHonorableKills())); + RewardHonor(NULL, 0, Trinity::Honor::hk_honor_at_level(getLevel(), pQuest->GetRewHonorableKills())); // title reward if (pQuest->GetCharTitleId()) @@ -15351,7 +15351,7 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder ) m_movementInfo.t_z = fields[29].GetFloat(); m_movementInfo.t_o = fields[30].GetFloat(); - if( !MaNGOS::IsValidMapCoord( + if( !Trinity::IsValidMapCoord( GetPositionX()+m_movementInfo.t_x,GetPositionY()+m_movementInfo.t_y, GetPositionZ()+m_movementInfo.t_z,GetOrientation()+m_movementInfo.t_o) || // transport size limited @@ -16061,7 +16061,7 @@ void Player::_LoadInventory(QueryResult *result, uint32 timediff) // send by mail problematic items while (!problematicItems.empty()) { - std::string subject = GetSession()->GetMangosString(LANG_NOT_EQUIPPED_ITEM); + std::string subject = GetSession()->GetTrinityString(LANG_NOT_EQUIPPED_ITEM); // fill mail MailDraft draft(subject); @@ -20569,7 +20569,7 @@ void Player::AutoUnequipOffhandIfNeed(bool force /*= false*/) offItem->SaveToDB(); // recursive and not have transaction guard into self, item not in inventory and can be save standalone CharacterDatabase.CommitTransaction(); - std::string subject = GetSession()->GetMangosString(LANG_NOT_EQUIPPED_ITEM); + std::string subject = GetSession()->GetTrinityString(LANG_NOT_EQUIPPED_ITEM); MailDraft(subject).AddItem(offItem).SendMailTo(this, MailSender(this, MAIL_STATIONERY_GM)); } } |