mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-26 07:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[8720] Added missing ReqItem 5 and 6 to database.

Browse source 
(backported from commit 7a722b8)
This commit is contained in:
tomrus88 2009-10-24 03:07:18 +04:00 • committed by VladimirMangos
parent e79aa4dee2
commit 3cc7f36006
12 changed files with 106 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/game/GossipDef.cpp
View file

@ -519,8 +519,8 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest )
Details = pQuest->GetDetails();
Objectives = pQuest->GetObjectives();
EndText = pQuest->GetEndText();
for (int i=0;i<QUEST_OBJECTIVES_COUNT;++i)
ObjectiveText[i]=pQuest->ObjectiveText[i];
for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
ObjectiveText[i] = pQuest->ObjectiveText[i];
int loc_idx = pSession->GetSessionDbLocaleIndex();
if (loc_idx >= 0)
@ -537,9 +537,9 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest )
if (ql->EndText.size() > loc_idx && !ql->EndText[loc_idx].empty())
EndText=ql->EndText[loc_idx];
for (int i=0;i<QUEST_OBJECTIVES_COUNT;++i)
for (int i = 0;i < QUEST_OBJECTIVES_COUNT; ++i)
if (ql->ObjectiveText[i].size() > loc_idx && !ql->ObjectiveText[i][loc_idx].empty())
ObjectiveText[i]=ql->ObjectiveText[i][loc_idx];
ObjectiveText[i] = ql->ObjectiveText[i][loc_idx];
}
}
@ -626,17 +626,12 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest )
data << uint32(pQuest->ReqSourceId[iI]);
}
for (iI = 0; iI < QUEST_OBJECTIVES_COUNT; ++iI)
for (iI = 0; iI < QUEST_ITEM_OBJECTIVES_COUNT; ++iI)
{
data << uint32(pQuest->ReqItemId[iI]);
data << uint32(pQuest->ReqItemCount[iI]);
}
data << uint32(0); // TODO: 5 item objective
data << uint32(0);
data << uint32(0); // TODO: 6 item objective
data << uint32(0);
for (iI = 0; iI < QUEST_OBJECTIVES_COUNT; ++iI)
data << ObjectiveText[iI];
@ -782,9 +777,10 @@ void PlayerMenu::SendQuestGiverRequestItems( Quest const *pQuest, uint64 npcGUID
data << uint32( pQuest->GetReqItemsCount() );
ItemPrototype const *pItem;
for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
for (int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
{
if ( !pQuest->ReqItemId[i] ) continue;
if ( !pQuest->ReqItemId[i] )
continue;
pItem = objmgr.GetItemPrototype(pQuest->ReqItemId[i]);
data << uint32(pQuest->ReqItemId[i]);
data << uint32(pQuest->ReqItemCount[i]);