josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/ObjectMgr: Some minor changes in LocaleString functions

Browse Source
This commit is contained in:
Spp
2011-08-04 15:14:15 +02:00
parent 85643fb8a0
commit d0de7976dc
8 changed files with 91 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Creature/GossipDef.cpp
+17 -17
View File
@@ -161,7 +161,7 @@ void PlayerMenu::SendGossipMenu(uint32 titleTextId, uint64 objectGUID) const
int locale = _session->GetSessionDbLocaleIndex();
if (locale >= 0)
if (QuestLocale const* localeData = sObjectMgr->GetQuestLocale(questID))
sObjectMgr->GetLocaleString(localeData->Title, locale, title);
ObjectMgr::GetLocaleString(localeData->Title, locale, title);
data << title; // max 0x200
}
@@ -188,7 +188,7 @@ void PlayerMenu::SendPointOfInterest(uint32 poiId) const
int32 locale = _session->GetSessionDbLocaleIndex();
if (locale >= 0)
if (PointOfInterestLocale const *localeData = sObjectMgr->GetPointOfInterestLocale(poiId))
sObjectMgr->GetLocaleString(localeData->IconName, locale, iconText);
ObjectMgr::GetLocaleString(localeData->IconName, locale, iconText);
WorldPacket data(SMSG_GOSSIP_POI, 4 + 4 + 4 + 4 + 4 + 10); // guess size
data << uint32(poi->flags);
@@ -268,7 +268,7 @@ void PlayerMenu::SendQuestGiverQuestList(QEmote eEmote, const std::string& Title
int loc_idx = _session->GetSessionDbLocaleIndex();
if (loc_idx >= 0)
if (QuestLocale const *ql = sObjectMgr->GetQuestLocale(questID))
sObjectMgr->GetLocaleString(ql->Title, loc_idx, title);
ObjectMgr::GetLocaleString(ql->Title, loc_idx, title);
data << uint32(questID);
data << uint32(qmi.QuestIcon);
@@ -306,10 +306,10 @@ void PlayerMenu::SendQuestGiverQuestDetails(Quest const *quest, uint64 npcGUID,
{
if (QuestLocale const* localeData = sObjectMgr->GetQuestLocale(quest->GetQuestId()))
{
sObjectMgr->GetLocaleString(localeData->Title, locale, questTitle);
sObjectMgr->GetLocaleString(localeData->Details, locale, questDetails);
sObjectMgr->GetLocaleString(localeData->Objectives, locale, questObjectives);
sObjectMgr->GetLocaleString(localeData->EndText, locale, questEndText);
ObjectMgr::GetLocaleString(localeData->Title, locale, questTitle);
ObjectMgr::GetLocaleString(localeData->Details, locale, questDetails);
ObjectMgr::GetLocaleString(localeData->Objectives, locale, questObjectives);
ObjectMgr::GetLocaleString(localeData->EndText, locale, questEndText);
}
}
@@ -416,14 +416,14 @@ void PlayerMenu::SendQuestQueryResponse(Quest const* quest) const
{
if (QuestLocale const* localeData = sObjectMgr->GetQuestLocale(quest->GetQuestId()))
{
sObjectMgr->GetLocaleString(localeData->Title, locale, questTitle);
sObjectMgr->GetLocaleString(localeData->Details, locale, questDetails);
sObjectMgr->GetLocaleString(localeData->Objectives, locale, questObjectives);
sObjectMgr->GetLocaleString(localeData->EndText, locale, questEndText);
sObjectMgr->GetLocaleString(localeData->CompletedText, locale, questCompletedText);
ObjectMgr::GetLocaleString(localeData->Title, locale, questTitle);
ObjectMgr::GetLocaleString(localeData->Details, locale, questDetails);
ObjectMgr::GetLocaleString(localeData->Objectives, locale, questObjectives);
ObjectMgr::GetLocaleString(localeData->EndText, locale, questEndText);
ObjectMgr::GetLocaleString(localeData->CompletedText, locale, questCompletedText);
for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
sObjectMgr->GetLocaleString(localeData->ObjectiveText[i], locale, questObjectiveText[i]);
ObjectMgr::GetLocaleString(localeData->ObjectiveText[i], locale, questObjectiveText[i]);
}
}
@@ -543,8 +543,8 @@ void PlayerMenu::SendQuestGiverOfferReward(Quest const* quest, uint64 npcGUID, b
{
if (QuestLocale const* localeData = sObjectMgr->GetQuestLocale(quest->GetQuestId()))
{
sObjectMgr->GetLocaleString(localeData->Title, locale, questTitle);
sObjectMgr->GetLocaleString(localeData->OfferRewardText, locale, questOfferRewardText);
ObjectMgr::GetLocaleString(localeData->Title, locale, questTitle);
ObjectMgr::GetLocaleString(localeData->OfferRewardText, locale, questOfferRewardText);
}
}
@@ -637,8 +637,8 @@ void PlayerMenu::SendQuestGiverRequestItems(Quest const *quest, uint64 npcGUID,
{
if (QuestLocale const* localeData = sObjectMgr->GetQuestLocale(quest->GetQuestId()))
{
sObjectMgr->GetLocaleString(localeData->Title, locale, questTitle);
sObjectMgr->GetLocaleString(localeData->RequestItemsText, locale, requestItemsText);
ObjectMgr::GetLocaleString(localeData->Title, locale, questTitle);
ObjectMgr::GetLocaleString(localeData->RequestItemsText, locale, requestItemsText);
}
}
src/server/game/Entities/Player/Player.cpp
+5 -5
View File
@@ -14095,8 +14095,8 @@ void Player::PrepareGossipMenu(WorldObject* source, uint32 menuId /*= 0*/, bool
uint32 idxEntry = MAKE_PAIR32(menuId, itr->second.OptionIndex);
if (GossipMenuItemsLocale const *no = sObjectMgr->GetGossipMenuItemsLocale(idxEntry))
{
sObjectMgr->GetLocaleString(no->OptionText, locale, strOptionText);
sObjectMgr->GetLocaleString(no->BoxText, locale, strBoxText);
ObjectMgr::GetLocaleString(no->OptionText, locale, strOptionText);
ObjectMgr::GetLocaleString(no->BoxText, locale, strBoxText);
}
}
@@ -14458,7 +14458,7 @@ void Player::SendPreparedQuest(uint64 guid)
int loc_idx = GetSession()->GetSessionDbLocaleIndex();
if (loc_idx >= 0)
if (NpcTextLocale const *nl = sObjectMgr->GetNpcTextLocale(textid))
sObjectMgr->GetLocaleString(nl->Text_0[0], loc_idx, title);
ObjectMgr::GetLocaleString(nl->Text_0[0], loc_idx, title);
}
else
{
@@ -14467,7 +14467,7 @@ void Player::SendPreparedQuest(uint64 guid)
int loc_idx = GetSession()->GetSessionDbLocaleIndex();
if (loc_idx >= 0)
if (NpcTextLocale const *nl = sObjectMgr->GetNpcTextLocale(textid))
sObjectMgr->GetLocaleString(nl->Text_1[0], loc_idx, title);
ObjectMgr::GetLocaleString(nl->Text_1[0], loc_idx, title);
}
}
}
@@ -16165,7 +16165,7 @@ void Player::SendQuestConfirmAccept(const Quest* pQuest, Player* pReceiver)
int loc_idx = pReceiver->GetSession()->GetSessionDbLocaleIndex();
if (loc_idx >= 0)
if (const QuestLocale* pLocale = sObjectMgr->GetQuestLocale(pQuest->GetQuestId()))
sObjectMgr->GetLocaleString(pLocale->Title, loc_idx, strTitle);
ObjectMgr::GetLocaleString(pLocale->Title, loc_idx, strTitle);
WorldPacket data(SMSG_QUEST_CONFIRM_ACCEPT, (4 + strTitle.size() + 8));
data << uint32(pQuest->GetQuestId());