*Backed out changeset 3be01fb200a5

--HG--
branch : trunk

1 files changed, 130 insertions, 0 deletions

diff --git a/src/game/GossipDef.cpp b/src/game/GossipDef.cpp
index 4f22573d2be..cd633f6ab8b 100644
--- a/src/game/GossipDef.cpp
+++ b/src/game/GossipDef.cpp
@@ -17,6 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 #include "QuestDef.h"
 #include "GossipDef.h"
 #include "ObjectMgr.h"
@@ -24,18 +25,23 @@
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "Formulas.h"
+
 GossipMenu::GossipMenu()
 {
     m_gItems.reserve(16);                                   // can be set for max from most often sizes to speedup push_back and less memory use
 }
+
 GossipMenu::~GossipMenu()
 {
     ClearMenu();
 }
+
 void GossipMenu::AddMenuItem(uint8 Icon, const std::string& Message, uint32 dtSender, uint32 dtAction, const std::string& BoxMessage, uint32 BoxMoney, bool Coded)
 {
     ASSERT( m_gItems.size() <= GOSSIP_MAX_MENU_ITEMS  );
+
     GossipMenuItem gItem;
+
     gItem.m_gIcon       = Icon;
     gItem.m_gMessage    = Message;
     gItem.m_gCoded      = Coded;
@@ -43,63 +49,81 @@ void GossipMenu::AddMenuItem(uint8 Icon, const std::string& Message, uint32 dtSe
     gItem.m_gAction     = dtAction;
     gItem.m_gBoxMessage = BoxMessage;
     gItem.m_gBoxMoney   = BoxMoney;
+
     m_gItems.push_back(gItem);
 }
+
 void GossipMenu::AddMenuItem(uint8 Icon, const std::string& Message, bool Coded)
 {
     AddMenuItem( Icon, Message, 0, 0, "", 0, Coded);
 }
+
 void GossipMenu::AddMenuItem(uint8 Icon, char const* Message, bool Coded)
 {
     AddMenuItem(Icon, std::string(Message ? Message : ""),Coded);
 }
+
 void GossipMenu::AddMenuItem(uint8 Icon, char const* Message, uint32 dtSender, uint32 dtAction, char const* BoxMessage, uint32 BoxMoney, bool Coded)
 {
     AddMenuItem(Icon, std::string(Message ? Message : ""), dtSender, dtAction, std::string(BoxMessage ? BoxMessage : ""), BoxMoney, Coded);
 }
+
 uint32 GossipMenu::MenuItemSender( unsigned int ItemId )
 {
     if ( ItemId >= m_gItems.size() ) return 0;
+
     return m_gItems[ ItemId ].m_gSender;
 }
+
 uint32 GossipMenu::MenuItemAction( unsigned int ItemId )
 {
     if ( ItemId >= m_gItems.size() ) return 0;
+
     return m_gItems[ ItemId ].m_gAction;
 }
+
 bool GossipMenu::MenuItemCoded( unsigned int ItemId )
 {
     if ( ItemId >= m_gItems.size() ) return 0;
+
     return m_gItems[ ItemId ].m_gCoded;
 }
+
 void GossipMenu::ClearMenu()
 {
     m_gItems.clear();
 }
+
 PlayerMenu::PlayerMenu( WorldSession *session ) : pSession(session)
 {
 }
+
 PlayerMenu::~PlayerMenu()
 {
     ClearMenus();
 }
+
 void PlayerMenu::ClearMenus()
 {
     mGossipMenu.ClearMenu();
     mQuestMenu.ClearMenu();
 }
+
 uint32 PlayerMenu::GossipOptionSender( unsigned int Selection )
 {
     return mGossipMenu.MenuItemSender( Selection );
 }
+
 uint32 PlayerMenu::GossipOptionAction( unsigned int Selection )
 {
     return mGossipMenu.MenuItemAction( Selection );
 }
+
 bool PlayerMenu::GossipOptionCoded( unsigned int Selection )
 {
     return mGossipMenu.MenuItemCoded( Selection );
 }
+
 void PlayerMenu::SendGossipMenu( uint32 TitleTextId, uint64 npcGUID )
 {
     WorldPacket data( SMSG_GOSSIP_MESSAGE, (100) );         // guess size
@@ -107,6 +131,7 @@ void PlayerMenu::SendGossipMenu( uint32 TitleTextId, uint64 npcGUID )
     data << uint32(0);                                      // new 2.4.0
     data << uint32( TitleTextId );
     data << uint32( mGossipMenu.MenuItemCount() );          // max count 0x10
+
     for (uint32 iI = 0; iI < mGossipMenu.MenuItemCount(); ++iI )
     {
         GossipMenuItem const& gItem = mGossipMenu.GetItem(iI);
@@ -117,16 +142,20 @@ void PlayerMenu::SendGossipMenu( uint32 TitleTextId, uint64 npcGUID )
         data << gItem.m_gMessage;                           // text for gossip item
         data << gItem.m_gBoxMessage;                        // accept text (related to money) pop up box, 2.0.3
     }
+
     data << uint32( mQuestMenu.MenuItemCount() );           // max count 0x20
+
     for (uint32 iI = 0; iI < mQuestMenu.MenuItemCount(); ++iI )
     {
         QuestMenuItem const& qItem = mQuestMenu.GetItem(iI);
         uint32 questID = qItem.m_qId;
         Quest const* pQuest = objmgr.GetQuestTemplate(questID);
+
         data << uint32(questID);
         data << uint32(qItem.m_qIcon);
         data << uint32(pSession->GetPlayer()->GetQuestLevel(pQuest));
         std::string Title = pQuest->GetTitle();
+
         int loc_idx = pSession->GetSessionDbLocaleIndex();
         if (loc_idx >= 0)
         {
@@ -139,15 +168,19 @@ void PlayerMenu::SendGossipMenu( uint32 TitleTextId, uint64 npcGUID )
         }
         data << Title;
     }
+
     pSession->SendPacket( &data );
     //sLog.outDebug( "WORLD: Sent SMSG_GOSSIP_MESSAGE NPCGuid=%u",GUID_LOPART(npcGUID) );
 }
+
 void PlayerMenu::CloseGossip()
 {
     WorldPacket data( SMSG_GOSSIP_COMPLETE, 0 );
     pSession->SendPacket( &data );
+
     //sLog.outDebug( "WORLD: Sent SMSG_GOSSIP_COMPLETE" );
 }
+
 // Outdated
 void PlayerMenu::SendPointOfInterest( float X, float Y, uint32 Icon, uint32 Flags, uint32 Data, char const * locName )
 {
@@ -157,9 +190,11 @@ void PlayerMenu::SendPointOfInterest( float X, float Y, uint32 Icon, uint32 Flag
     data << uint32(Icon);
     data << uint32(Data);
     data << locName;
+
     pSession->SendPacket( &data );
     //sLog.outDebug("WORLD: Sent SMSG_GOSSIP_POI");
 }
+
 void PlayerMenu::SendPointOfInterest( uint32 poi_id )
 {
     PointOfInterest const* poi = objmgr.GetPointOfInterest(poi_id);
@@ -168,7 +203,9 @@ void PlayerMenu::SendPointOfInterest( uint32 poi_id )
         sLog.outErrorDb("Requested send not existed POI (Id: %u), ignore.",poi_id);
         return;
     }
+
     std::string icon_name = poi->icon_name;
+
     int loc_idx = pSession->GetSessionDbLocaleIndex();
     if (loc_idx >= 0)
     {
@@ -179,6 +216,7 @@ void PlayerMenu::SendPointOfInterest( uint32 poi_id )
                 icon_name = pl->IconName[loc_idx];
         }
     }
+
     WorldPacket data( SMSG_GOSSIP_POI, (4+4+4+4+4+10) );    // guess size
     data << uint32(poi->flags);
     data << float(poi->x);
@@ -186,14 +224,18 @@ void PlayerMenu::SendPointOfInterest( uint32 poi_id )
     data << uint32(poi->icon);
     data << uint32(poi->data);
     data << icon_name;
+
     pSession->SendPacket( &data );
     //sLog.outDebug("WORLD: Sent SMSG_GOSSIP_POI");
 }
+
 void PlayerMenu::SendTalking( uint32 textID )
 {
     GossipText const* pGossip = objmgr.GetGossipText(textID);
+
     WorldPacket data( SMSG_NPC_TEXT_UPDATE, 100 );          // guess size
     data << textID;                                         // can be < 0
+
     if (!pGossip)
     {
         for(uint32 i = 0; i < 8; ++i)
@@ -236,15 +278,19 @@ void PlayerMenu::SendTalking( uint32 textID )
         for (int i=0; i<8; ++i)
         {
             data << pGossip->Options[i].Probability;
+
             if ( Text_0[i].empty() )
                 data << Text_1[i];
             else
                 data << Text_0[i];
+
             if ( Text_1[i].empty() )
                 data << Text_0[i];
             else
                 data << Text_1[i];
+
             data << pGossip->Options[i].Language;
+
             for(int j = 0; j < 3; ++j)
             {
                 data << pGossip->Options[i].Emotes[j]._Delay;
@@ -253,8 +299,10 @@ void PlayerMenu::SendTalking( uint32 textID )
         }
     }
     pSession->SendPacket( &data );
+
     sLog.outDebug(  "WORLD: Sent SMSG_NPC_TEXT_UPDATE " );
 }
+
 void PlayerMenu::SendTalking( char const * title, char const * text )
 {
     WorldPacket data( SMSG_NPC_TEXT_UPDATE, 50 );           // guess size
@@ -272,30 +320,41 @@ void PlayerMenu::SendTalking( char const * title, char const * text )
         data << uint32(0);
         data << uint32(0);
     }
+
     pSession->SendPacket( &data );
+
     sLog.outDebug( "WORLD: Sent SMSG_NPC_TEXT_UPDATE " );
 }
+
 /*********************************************************/
 /***                    QUEST SYSTEM                   ***/
 /*********************************************************/
+
 QuestMenu::QuestMenu()
 {
     m_qItems.reserve(16);                                   // can be set for max from most often sizes to speedup push_back and less memory use
 }
+
 QuestMenu::~QuestMenu()
 {
     ClearMenu();
 }
+
 void QuestMenu::AddMenuItem( uint32 QuestId, uint8 Icon)
 {
     Quest const* qinfo = objmgr.GetQuestTemplate(QuestId);
     if (!qinfo) return;
+
     ASSERT( m_qItems.size() <= GOSSIP_MAX_MENU_ITEMS  );
+
     QuestMenuItem qItem;
+
     qItem.m_qId        = QuestId;
     qItem.m_qIcon      = Icon;
+
     m_qItems.push_back(qItem);
 }
+
 bool QuestMenu::HasItem( uint32 questid )
 {
     for (QuestMenuItemList::const_iterator i = m_qItems.begin(); i != m_qItems.end(); ++i)
@@ -307,10 +366,12 @@ bool QuestMenu::HasItem( uint32 questid )
     }
     return false;
 }
+
 void QuestMenu::ClearMenu()
 {
     m_qItems.clear();
 }
+
 void PlayerMenu::SendQuestGiverQuestList( QEmote eEmote, const std::string& Title, uint64 npcGUID )
 {
     WorldPacket data( SMSG_QUESTGIVER_QUEST_LIST, 100 );    // guess size
@@ -319,12 +380,16 @@ void PlayerMenu::SendQuestGiverQuestList( QEmote eEmote, const std::string& Titl
     data << uint32(eEmote._Delay );                         // player emote
     data << uint32(eEmote._Emote );                         // NPC emote
     data << uint8 ( mQuestMenu.MenuItemCount() );
+
     for (uint32 iI = 0; iI < mQuestMenu.MenuItemCount(); ++iI )
     {
         QuestMenuItem const& qmi = mQuestMenu.GetItem(iI);
+
         uint32 questID = qmi.m_qId;
         Quest const *pQuest = objmgr.GetQuestTemplate(questID);
+
         std::string title = pQuest ? pQuest->GetTitle() : "";
+
         int loc_idx = pSession->GetSessionDbLocaleIndex();
         if (loc_idx >= 0)
         {
@@ -334,6 +399,7 @@ void PlayerMenu::SendQuestGiverQuestList( QEmote eEmote, const std::string& Titl
                     title=ql->Title[loc_idx];
             }
         }
+
         data << uint32(questID);
         data << uint32(qmi.m_qIcon);
         data << uint32(pSession->GetPlayer()->GetQuestLevel(pQuest));
@@ -342,21 +408,26 @@ void PlayerMenu::SendQuestGiverQuestList( QEmote eEmote, const std::string& Titl
     pSession->SendPacket( &data );
     sLog.outDebug("WORLD: Sent SMSG_QUESTGIVER_QUEST_LIST NPC Guid=%u", GUID_LOPART(npcGUID));
 }
+
 void PlayerMenu::SendQuestGiverStatus( uint8 questStatus, uint64 npcGUID )
 {
     WorldPacket data( SMSG_QUESTGIVER_STATUS, 9 );
     data << uint64(npcGUID);
     data << uint8(questStatus);
+
     pSession->SendPacket( &data );
     sLog.outDebug( "WORLD: Sent SMSG_QUESTGIVER_STATUS NPC Guid=%u, status=%u", GUID_LOPART(npcGUID), questStatus);
 }
+
 void PlayerMenu::SendQuestGiverQuestDetails( Quest const *pQuest, uint64 npcGUID, bool ActivateAccept )
 {
     WorldPacket data(SMSG_QUESTGIVER_QUEST_DETAILS, 100);   // guess size
+
     std::string Title      = pQuest->GetTitle();
     std::string Details    = pQuest->GetDetails();
     std::string Objectives = pQuest->GetObjectives();
     std::string EndText    = pQuest->GetEndText();
+
     int loc_idx = pSession->GetSessionDbLocaleIndex();
     if (loc_idx >= 0)
     {
@@ -373,6 +444,7 @@ void PlayerMenu::SendQuestGiverQuestDetails( Quest const *pQuest, uint64 npcGUID
                 EndText=ql->EndText[loc_idx];
         }
     }
+
     data << uint64(npcGUID);
     data << uint64(0);                                      // wotlk, something todo with quest sharing?
     data << uint32(pQuest->GetQuestId());
@@ -383,6 +455,7 @@ void PlayerMenu::SendQuestGiverQuestDetails( Quest const *pQuest, uint64 npcGUID
     data << uint32(pQuest->GetSuggestedPlayers());
     data << uint8(0);                                       // new wotlk
     data << uint8(0);                                       // new 3.1
+
     if (pQuest->HasFlag(QUEST_FLAGS_HIDDEN_REWARDS))
     {
         data << uint32(0);                                  // Rewarded chosen items hidden
@@ -392,6 +465,7 @@ void PlayerMenu::SendQuestGiverQuestDetails( Quest const *pQuest, uint64 npcGUID
     else
     {
         ItemPrototype const* IProto;
+
         data << uint32(pQuest->GetRewChoiceItemsCount());
         for (uint32 i=0; i < QUEST_REWARD_CHOICES_COUNT; ++i)
         {
@@ -404,6 +478,7 @@ void PlayerMenu::SendQuestGiverQuestDetails( Quest const *pQuest, uint64 npcGUID
             else
                 data << uint32( 0x00 );
         }
+
         data << uint32(pQuest->GetRewItemsCount());
         for (uint32 i=0; i < QUEST_REWARDS_COUNT; ++i)
         {
@@ -416,14 +491,17 @@ void PlayerMenu::SendQuestGiverQuestDetails( Quest const *pQuest, uint64 npcGUID
             else
                 data << uint32(0);
         }
+
         data << uint32(pQuest->GetRewOrReqMoney());
     }
+
     // rewarded honor points. Multiply with 10 to satisfy client
     data << uint32(10*Trinity::Honor::hk_honor_at_level(pSession->GetPlayer()->getLevel(), pQuest->GetRewHonorableKills()));
     data << uint32(pQuest->GetRewSpell());                  // reward spell, this spell will display (icon) (casted if RewSpellCast==0)
     data << uint32(pQuest->GetRewSpellCast());              // casted spell
     data << uint32(pQuest->GetCharTitleId());               // CharTitleId, new 2.4.0, player gets this title (id from CharTitles)
     data << uint32(pQuest->GetBonusTalents());              // bonus talents
+
     data << uint32(QUEST_EMOTE_COUNT);
     for (uint32 i=0; i < QUEST_EMOTE_COUNT; ++i)
     {
@@ -431,8 +509,10 @@ void PlayerMenu::SendQuestGiverQuestDetails( Quest const *pQuest, uint64 npcGUID
         data << uint32(pQuest->DetailsEmoteDelay[i]);       // DetailsEmoteDelay (in ms)
     }
     pSession->SendPacket( &data );
+
     sLog.outDebug("WORLD: Sent SMSG_QUESTGIVER_QUEST_DETAILS NPCGuid=%u, questid=%u", GUID_LOPART(npcGUID), pQuest->GetQuestId());
 }
+
 void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest )
 {
     std::string Title,Details,Objectives,EndText;
@@ -443,6 +523,7 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest )
     EndText = pQuest->GetEndText();
     for (int i=0;i<QUEST_OBJECTIVES_COUNT;++i)
         ObjectiveText[i]=pQuest->ObjectiveText[i];
+
     int loc_idx = pSession->GetSessionDbLocaleIndex();
     if (loc_idx >= 0)
     {
@@ -457,30 +538,40 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest )
                 Objectives=ql->Objectives[loc_idx];
             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)
                 if (ql->ObjectiveText[i].size() > loc_idx && !ql->ObjectiveText[i][loc_idx].empty())
                     ObjectiveText[i]=ql->ObjectiveText[i][loc_idx];
         }
     }
+
     WorldPacket data( SMSG_QUEST_QUERY_RESPONSE, 100 );     // guess size
+
     data << uint32(pQuest->GetQuestId());
     data << uint32(pQuest->GetQuestMethod());               // Accepted values: 0, 1 or 2. 0==IsAutoComplete() (skip objectives/details)
     data << uint32(pQuest->GetQuestLevel());                // may be 0, static data, in other cases must be used dynamic level: Player::GetQuestLevel
     data << uint32(pQuest->GetZoneOrSort());                // zone or sort to display in quest log
+
     data << uint32(pQuest->GetType());
     data << uint32(pQuest->GetSuggestedPlayers());
+
     data << uint32(pQuest->GetRepObjectiveFaction());       // shown in quest log as part of quest objective
     data << uint32(pQuest->GetRepObjectiveValue());         // shown in quest log as part of quest objective
+
     data << uint32(0);                                      // RequiredOpositeRepFaction
     data << uint32(0);                                      // RequiredOpositeRepValue, required faction value with another (oposite) faction (objective)
+
     data << uint32(pQuest->GetNextQuestInChain());          // client will request this quest from NPC, if not 0
+
     if (pQuest->HasFlag(QUEST_FLAGS_HIDDEN_REWARDS))
         data << uint32(0);                                  // Hide money rewarded
     else
         data << uint32(pQuest->GetRewOrReqMoney());
+
     data << uint32(pQuest->GetRewMoneyMaxLevel());          // used in XP calculation at client
     data << uint32(pQuest->GetRewSpell());                  // reward spell, this spell will display (icon) (casted if RewSpellCast==0)
     data << uint32(pQuest->GetRewSpellCast());              // casted spell
+
     // rewarded honor points
     data << uint32(Trinity::Honor::hk_honor_at_level(pSession->GetPlayer()->getLevel(), pQuest->GetRewHonorableKills()));
     data << uint32(pQuest->GetSrcItemId());
@@ -488,7 +579,9 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest )
     data << uint32(pQuest->GetCharTitleId());               // CharTitleId, new 2.4.0, player gets this title (id from CharTitles)
     data << uint32(pQuest->GetPlayersSlain());              // players slain
     data << uint32(pQuest->GetBonusTalents());              // bonus talents
+
     int iI;
+
     if (pQuest->HasFlag(QUEST_FLAGS_HIDDEN_REWARDS))
     {
         for (iI = 0; iI < QUEST_REWARDS_COUNT; ++iI)
@@ -509,14 +602,17 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest )
             data << uint32(pQuest->RewChoiceItemCount[iI]);
         }
     }
+
     data << pQuest->GetPointMapId();
     data << pQuest->GetPointX();
     data << pQuest->GetPointY();
     data << pQuest->GetPointOpt();
+
     data << Title;
     data << Objectives;
     data << Details;
     data << EndText;
+
     for (iI = 0; iI < QUEST_OBJECTIVES_COUNT; ++iI)
     {
         if (pQuest->ReqCreatureOrGOId[iI] < 0)
@@ -531,22 +627,28 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest )
         data << uint32(pQuest->ReqCreatureOrGOCount[iI]);
         data << uint32(pQuest->ReqSourceId[iI]);
     }
+
     for (iI = 0; iI < QUEST_OBJECTIVES_COUNT; ++iI)
     {
         data << uint32(pQuest->ReqItemId[iI]);
         data << uint32(pQuest->ReqItemCount[iI]);
     }
+
     data << uint32(0);                                      // TODO: 5 item objective
     data << uint32(0);
+
     for (iI = 0; iI < QUEST_OBJECTIVES_COUNT; ++iI)
         data << ObjectiveText[iI];
+
     pSession->SendPacket( &data );
     sLog.outDebug( "WORLD: Sent SMSG_QUEST_QUERY_RESPONSE questid=%u", pQuest->GetQuestId() );
 }
+
 void PlayerMenu::SendQuestGiverOfferReward( Quest const* pQuest, uint64 npcGUID, bool EnableNext )
 {
     std::string Title = pQuest->GetTitle();
     std::string OfferRewardText = pQuest->GetOfferRewardText();
+
     int loc_idx = pSession->GetSessionDbLocaleIndex();
     if (loc_idx >= 0)
     {
@@ -559,13 +661,17 @@ void PlayerMenu::SendQuestGiverOfferReward( Quest const* pQuest, uint64 npcGUID,
                 OfferRewardText=ql->OfferRewardText[loc_idx];
         }
     }
+
     WorldPacket data( SMSG_QUESTGIVER_OFFER_REWARD, 50 );   // guess size
+
     data << npcGUID;
     data << pQuest->GetQuestId();
     data << Title;
     data << OfferRewardText;
+
     data << uint32( EnableNext );
     data << uint32(0);                                      // unk
+
     uint32 EmoteCount = 0;
     for (uint32 i = 0; i < QUEST_EMOTE_COUNT; ++i)
     {
@@ -573,36 +679,45 @@ void PlayerMenu::SendQuestGiverOfferReward( Quest const* pQuest, uint64 npcGUID,
             break;
         ++EmoteCount;
     }
+
     data << EmoteCount;                                     // Emote Count
     for (uint32 i = 0; i < EmoteCount; ++i)
     {
         data << uint32(pQuest->OfferRewardEmoteDelay[i]);   // Delay Emote
         data << uint32(pQuest->OfferRewardEmote[i]);
     }
+
     ItemPrototype const *pItem;
+
     data << uint32(pQuest->GetRewChoiceItemsCount());
     for (uint32 i=0; i < pQuest->GetRewChoiceItemsCount(); ++i)
     {
         pItem = objmgr.GetItemPrototype( pQuest->RewChoiceItemId[i] );
+
         data << uint32(pQuest->RewChoiceItemId[i]);
         data << uint32(pQuest->RewChoiceItemCount[i]);
+
         if ( pItem )
             data << uint32(pItem->DisplayInfoID);
         else
             data << uint32(0);
     }
+
     data << uint32(pQuest->GetRewItemsCount());
     for (uint16 i=0; i < pQuest->GetRewItemsCount(); ++i)
     {
         pItem = objmgr.GetItemPrototype(pQuest->RewItemId[i]);
         data << uint32(pQuest->RewItemId[i]);
         data << uint32(pQuest->RewItemCount[i]);
+
         if ( pItem )
             data << uint32(pItem->DisplayInfoID);
         else
             data << uint32(0);
     }
+
     data << uint32(pQuest->GetRewOrReqMoney());
+
     // rewarded honor points. Multiply with 10 to satisfy client
     data << uint32(10*Trinity::Honor::hk_honor_at_level(pSession->GetPlayer()->getLevel(), pQuest->GetRewHonorableKills()));
     data << uint32(0x08);                                   // unused by client?
@@ -613,12 +728,15 @@ void PlayerMenu::SendQuestGiverOfferReward( Quest const* pQuest, uint64 npcGUID,
     pSession->SendPacket( &data );
     sLog.outDebug( "WORLD: Sent SMSG_QUESTGIVER_OFFER_REWARD NPCGuid=%u, questid=%u", GUID_LOPART(npcGUID), pQuest->GetQuestId() );
 }
+
 void PlayerMenu::SendQuestGiverRequestItems( Quest const *pQuest, uint64 npcGUID, bool Completable, bool CloseOnCancel )
 {
     // 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
+
     std::string Title = pQuest->GetTitle();
     std::string RequestItemsText = pQuest->GetRequestItemsText();
+
     int loc_idx = pSession->GetSessionDbLocaleIndex();
     if (loc_idx >= 0)
     {
@@ -631,29 +749,37 @@ void PlayerMenu::SendQuestGiverRequestItems( Quest const *pQuest, uint64 npcGUID
                 RequestItemsText=ql->RequestItemsText[loc_idx];
         }
     }
+
     if (!pQuest->GetReqItemsCount() && Completable)
     {
         SendQuestGiverOfferReward(pQuest, npcGUID, true);
         return;
     }
+
     WorldPacket data( SMSG_QUESTGIVER_REQUEST_ITEMS, 50 );  // guess size
     data << npcGUID;
     data << pQuest->GetQuestId();
     data << Title;
     data << RequestItemsText;
+
     data << uint32(0x00);                                   // unknown
+
     if(Completable)
         data << pQuest->GetCompleteEmote();
     else
         data << pQuest->GetIncompleteEmote();
+
     // Close Window after cancel
     if (CloseOnCancel)
         data << uint32(0x01);
     else
         data << uint32(0x00);
+
     data << uint32(0x00);                                   // unknown
+
     // Required Money
     data << uint32(pQuest->GetRewOrReqMoney() < 0 ? -pQuest->GetRewOrReqMoney() : 0);
+
     data << uint32( pQuest->GetReqItemsCount() );
     ItemPrototype const *pItem;
     for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
@@ -662,18 +788,22 @@ void PlayerMenu::SendQuestGiverRequestItems( Quest const *pQuest, uint64 npcGUID
         pItem = objmgr.GetItemPrototype(pQuest->ReqItemId[i]);
         data << uint32(pQuest->ReqItemId[i]);
         data << uint32(pQuest->ReqItemCount[i]);
+
         if ( pItem )
             data << uint32(pItem->DisplayInfoID);
         else
             data << uint32(0);
     }
+
     if ( !Completable )
         data << uint32(0x00);
     else
         data << uint32(0x03);
+
     data << uint32(0x04);
     data << uint32(0x08);
     data << uint32(0x10);
+
     pSession->SendPacket( &data );
     sLog.outDebug( "WORLD: Sent SMSG_QUESTGIVER_REQUEST_ITEMS NPCGuid=%u, questid=%u", GUID_LOPART(npcGUID), pQuest->GetQuestId() );
 }