diff options
| -rw-r--r-- | src/game/GossipDef.cpp | 19 | ||||
| -rw-r--r-- | src/shared/revision_nr.h | 2 |
2 files changed, 10 insertions, 11 deletions
diff --git a/src/game/GossipDef.cpp b/src/game/GossipDef.cpp index b68c8b17f00..300d02cca4e 100644 --- a/src/game/GossipDef.cpp +++ b/src/game/GossipDef.cpp @@ -698,16 +698,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 // items. Otherwise, we'll skip straight to the OfferReward - // We may wish a better check, perhaps checking the real quest requirements - if (pQuest->GetRequestItemsText().empty()) - { - SendQuestGiverOfferReward(pQuest, npcGUID, true); - return; - } - - std::string Title,RequestItemsText; - Title = pQuest->GetTitle(); - RequestItemsText = pQuest->GetRequestItemsText(); + std::string Title = pQuest->GetTitle(); + std::string RequestItemsText = pQuest->GetRequestItemsText(); int loc_idx = pSession->GetSessionDbLocaleIndex(); if (loc_idx >= 0) @@ -722,6 +714,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 data << npcGUID; data << pQuest->GetQuestId(); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 72f466b2f17..d254fae6a3b 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7288" + #define REVISION_NR "7289" #endif // __REVISION_NR_H__ |