mirror of
https://github.com/mangosfour/server.git
synced 2025-12-18 10:37:01 +00:00
[7289] Make quest related check work in case absent English localization in DB.
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
parent
16cb8a5eda
commit
25a57cca18
2 changed files with 10 additions and 11 deletions
|
|
@ -696,16 +696,8 @@ void PlayerMenu::SendQuestGiverRequestItems( Quest const *pQuest, uint64 npcGUID
|
||||||
// We can always call to RequestItems, but this packet only goes out if there are actually
|
// We can always call to RequestItems, but this packet only goes out if there are actually
|
||||||
// items. Otherwise, we'll skip straight to the OfferReward
|
// items. Otherwise, we'll skip straight to the OfferReward
|
||||||
|
|
||||||
// We may wish a better check, perhaps checking the real quest requirements
|
std::string Title = pQuest->GetTitle();
|
||||||
if (pQuest->GetRequestItemsText().empty())
|
std::string RequestItemsText = pQuest->GetRequestItemsText();
|
||||||
{
|
|
||||||
SendQuestGiverOfferReward(pQuest, npcGUID, true);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string Title,RequestItemsText;
|
|
||||||
Title = pQuest->GetTitle();
|
|
||||||
RequestItemsText = pQuest->GetRequestItemsText();
|
|
||||||
|
|
||||||
int loc_idx = pSession->GetSessionDbLocaleIndex();
|
int loc_idx = pSession->GetSessionDbLocaleIndex();
|
||||||
if (loc_idx >= 0)
|
if (loc_idx >= 0)
|
||||||
|
|
@ -720,6 +712,13 @@ void PlayerMenu::SendQuestGiverRequestItems( Quest const *pQuest, uint64 npcGUID
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// We may wish a better check, perhaps checking the real quest requirements
|
||||||
|
if (RequestItemsText.empty())
|
||||||
|
{
|
||||||
|
SendQuestGiverOfferReward(pQuest, npcGUID, true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
WorldPacket data( SMSG_QUESTGIVER_REQUEST_ITEMS, 50 ); // guess size
|
WorldPacket data( SMSG_QUESTGIVER_REQUEST_ITEMS, 50 ); // guess size
|
||||||
data << npcGUID;
|
data << npcGUID;
|
||||||
data << pQuest->GetQuestId();
|
data << pQuest->GetQuestId();
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "7288"
|
#define REVISION_NR "7289"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue