Code style (game + scripts only):

"( " --> "("
" )" --> ")"

--HG--
branch : trunk

1 files changed, 82 insertions, 82 deletions

diff --git a/src/game/GossipDef.cpp b/src/game/GossipDef.cpp
index e15557a486c..2595ba4d420 100644
--- a/src/game/GossipDef.cpp
+++ b/src/game/GossipDef.cpp
@@ -39,7 +39,7 @@ GossipMenu::~GossipMenu()
 
 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  );
+    ASSERT(m_gItems.size() <= GOSSIP_MAX_MENU_ITEMS);
 
     GossipMenuItem gItem;
 
@@ -67,7 +67,7 @@ void GossipMenu::AddGossipMenuItemData(uint32 action_menu, uint32 action_poi, ui
 
 void GossipMenu::AddMenuItem(uint8 Icon, const std::string& Message, bool Coded)
 {
-    AddMenuItem( Icon, Message, 0, 0, "", 0, Coded);
+    AddMenuItem(Icon, Message, 0, 0, "", 0, Coded);
 }
 
 void GossipMenu::AddMenuItem(uint8 Icon, char const* Message, bool Coded)
@@ -80,23 +80,23 @@ void GossipMenu::AddMenuItem(uint8 Icon, char const* Message, uint32 dtSender, u
     AddMenuItem(Icon, std::string(Message ? Message : ""), dtSender, dtAction, std::string(BoxMessage ? BoxMessage : ""), BoxMoney, Coded);
 }
 
-uint32 GossipMenu::MenuItemSender( unsigned int ItemId )
+uint32 GossipMenu::MenuItemSender(unsigned int ItemId)
 {
-    if ( ItemId >= m_gItems.size() ) return 0;
+    if (ItemId >= m_gItems.size()) return 0;
 
     return m_gItems[ ItemId ].m_gSender;
 }
 
-uint32 GossipMenu::MenuItemAction( unsigned int ItemId )
+uint32 GossipMenu::MenuItemAction(unsigned int ItemId)
 {
-    if ( ItemId >= m_gItems.size() ) return 0;
+    if (ItemId >= m_gItems.size()) return 0;
 
    return m_gItems[ ItemId ].m_gOptionId;
 }
 
-bool GossipMenu::MenuItemCoded( unsigned int ItemId )
+bool GossipMenu::MenuItemCoded(unsigned int ItemId)
 {
-    if ( ItemId >= m_gItems.size() ) return 0;
+    if (ItemId >= m_gItems.size()) return 0;
 
     return m_gItems[ ItemId ].m_gCoded;
 }
@@ -107,7 +107,7 @@ void GossipMenu::ClearMenu()
     m_gItemsData.clear();
 }
 
-PlayerMenu::PlayerMenu( WorldSession *session ) : pSession(session)
+PlayerMenu::PlayerMenu(WorldSession *session) : pSession(session)
 {
 }
 
@@ -122,19 +122,19 @@ void PlayerMenu::ClearMenus()
     mQuestMenu.ClearMenu();
 }
 
-uint32 PlayerMenu::GossipOptionSender( unsigned int Selection )
+uint32 PlayerMenu::GossipOptionSender(unsigned int Selection)
 {
-    return mGossipMenu.MenuItemSender( Selection );
+    return mGossipMenu.MenuItemSender(Selection);
 }
 
-uint32 PlayerMenu::GossipOptionAction( unsigned int Selection )
+uint32 PlayerMenu::GossipOptionAction(unsigned int Selection)
 {
-    return mGossipMenu.MenuItemAction( Selection );
+    return mGossipMenu.MenuItemAction(Selection);
 }
 
-bool PlayerMenu::GossipOptionCoded( unsigned int Selection )
+bool PlayerMenu::GossipOptionCoded(unsigned int Selection)
 {
-    return mGossipMenu.MenuItemCoded( Selection );
+    return mGossipMenu.MenuItemCoded(Selection);
 }
 
 void PlayerMenu::SendGossipMenu(uint32 TitleTextId, uint64 objectGUID)
@@ -145,20 +145,20 @@ void PlayerMenu::SendGossipMenu(uint32 TitleTextId, uint64 objectGUID)
     data << uint32(TitleTextId);
     data << uint32(mGossipMenu.MenuItemCount());          // max count 0x10
 
-    for (uint32 iI = 0; iI < mGossipMenu.MenuItemCount(); ++iI )
+    for (uint32 iI = 0; iI < mGossipMenu.MenuItemCount(); ++iI)
     {
         GossipMenuItem const& gItem = mGossipMenu.GetItem(iI);
-        data << uint32( iI );
-        data << uint8( gItem.m_gIcon );
-        data << uint8( gItem.m_gCoded );                    // makes pop up box password
+        data << uint32(iI);
+        data << uint8(gItem.m_gIcon);
+        data << uint8(gItem.m_gCoded);                    // makes pop up box password
         data << uint32(gItem.m_gBoxMoney);                  // money required to open menu, 2.0.3
         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
+    data << uint32(mQuestMenu.MenuItemCount());           // max count 0x20
 
-    for (uint32 iI = 0; iI < mQuestMenu.MenuItemCount(); ++iI )
+    for (uint32 iI = 0; iI < mQuestMenu.MenuItemCount(); ++iI)
     {
         QuestMenuItem const& qItem = mQuestMenu.GetItem(iI);
         uint32 questID = qItem.m_qId;
@@ -182,33 +182,33 @@ void PlayerMenu::SendGossipMenu(uint32 TitleTextId, uint64 objectGUID)
         data << Title;
     }
 
-    pSession->SendPacket( &data );
-    //sLog.outDebug( "WORLD: Sent SMSG_GOSSIP_MESSAGE NPCGuid=%u",GUID_LOPART(npcGUID) );
+    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 );
+    WorldPacket data(SMSG_GOSSIP_COMPLETE, 0);
+    pSession->SendPacket(&data);
 
-    //sLog.outDebug( "WORLD: Sent SMSG_GOSSIP_COMPLETE" );
+    //sLog.outDebug("WORLD: Sent SMSG_GOSSIP_COMPLETE");
 }
 
 // Outdated
-void PlayerMenu::SendPointOfInterest( float X, float Y, uint32 Icon, uint32 Flags, uint32 Data, char const * locName )
+void PlayerMenu::SendPointOfInterest(float X, float Y, uint32 Icon, uint32 Flags, uint32 Data, char const * locName)
 {
-    WorldPacket data( SMSG_GOSSIP_POI, (4+4+4+4+4+10) );    // guess size
+    WorldPacket data(SMSG_GOSSIP_POI, (4+4+4+4+4+10));    // guess size
     data << Flags;
     data << X << Y;
     data << uint32(Icon);
     data << uint32(Data);
     data << locName;
 
-    pSession->SendPacket( &data );
+    pSession->SendPacket(&data);
     //sLog.outDebug("WORLD: Sent SMSG_GOSSIP_POI");
 }
 
-void PlayerMenu::SendPointOfInterest( uint32 poi_id )
+void PlayerMenu::SendPointOfInterest(uint32 poi_id)
 {
     PointOfInterest const* poi = objmgr.GetPointOfInterest(poi_id);
     if (!poi)
@@ -230,7 +230,7 @@ void PlayerMenu::SendPointOfInterest( uint32 poi_id )
         }
     }
 
-    WorldPacket data( SMSG_GOSSIP_POI, (4+4+4+4+4+10) );    // guess size
+    WorldPacket data(SMSG_GOSSIP_POI, (4+4+4+4+4+10));    // guess size
     data << uint32(poi->flags);
     data << float(poi->x);
     data << float(poi->y);
@@ -238,15 +238,15 @@ void PlayerMenu::SendPointOfInterest( uint32 poi_id )
     data << uint32(poi->data);
     data << icon_name;
 
-    pSession->SendPacket( &data );
+    pSession->SendPacket(&data);
     //sLog.outDebug("WORLD: Sent SMSG_GOSSIP_POI");
 }
 
-void PlayerMenu::SendTalking( uint32 textID )
+void PlayerMenu::SendTalking(uint32 textID)
 {
     GossipText const* pGossip = objmgr.GetGossipText(textID);
 
-    WorldPacket data( SMSG_NPC_TEXT_UPDATE, 100 );          // guess size
+    WorldPacket data(SMSG_NPC_TEXT_UPDATE, 100);          // guess size
     data << textID;                                         // can be < 0
 
     if (!pGossip)
@@ -292,12 +292,12 @@ void PlayerMenu::SendTalking( uint32 textID )
         {
             data << pGossip->Options[i].Probability;
 
-            if ( Text_0[i].empty() )
+            if (Text_0[i].empty())
                 data << Text_1[i];
             else
                 data << Text_0[i];
 
-            if ( Text_1[i].empty() )
+            if (Text_1[i].empty())
                 data << Text_0[i];
             else
                 data << Text_1[i];
@@ -311,14 +311,14 @@ void PlayerMenu::SendTalking( uint32 textID )
             }
         }
     }
-    pSession->SendPacket( &data );
+    pSession->SendPacket(&data);
 
-    sLog.outDebug(  "WORLD: Sent SMSG_NPC_TEXT_UPDATE " );
+    sLog.outDebug("WORLD: Sent SMSG_NPC_TEXT_UPDATE ");
 }
 
-void PlayerMenu::SendTalking( char const * title, char const * text )
+void PlayerMenu::SendTalking(char const * title, char const * text)
 {
-    WorldPacket data( SMSG_NPC_TEXT_UPDATE, 50 );           // guess size
+    WorldPacket data(SMSG_NPC_TEXT_UPDATE, 50);           // guess size
     data << uint32(0);
     for (uint32 i = 0; i < 8; ++i)
     {
@@ -334,9 +334,9 @@ void PlayerMenu::SendTalking( char const * title, char const * text )
         data << uint32(0);
     }
 
-    pSession->SendPacket( &data );
+    pSession->SendPacket(&data);
 
-    sLog.outDebug( "WORLD: Sent SMSG_NPC_TEXT_UPDATE " );
+    sLog.outDebug("WORLD: Sent SMSG_NPC_TEXT_UPDATE ");
 }
 
 /*********************************************************/
@@ -353,12 +353,12 @@ QuestMenu::~QuestMenu()
     ClearMenu();
 }
 
-void QuestMenu::AddMenuItem( uint32 QuestId, uint8 Icon)
+void QuestMenu::AddMenuItem(uint32 QuestId, uint8 Icon)
 {
     Quest const* qinfo = objmgr.GetQuestTemplate(QuestId);
     if (!qinfo) return;
 
-    ASSERT( m_qItems.size() <= GOSSIP_MAX_MENU_ITEMS  );
+    ASSERT(m_qItems.size() <= GOSSIP_MAX_MENU_ITEMS);
 
     QuestMenuItem qItem;
 
@@ -368,7 +368,7 @@ void QuestMenu::AddMenuItem( uint32 QuestId, uint8 Icon)
     m_qItems.push_back(qItem);
 }
 
-bool QuestMenu::HasItem( uint32 questid )
+bool QuestMenu::HasItem(uint32 questid)
 {
     for (QuestMenuItemList::const_iterator i = m_qItems.begin(); i != m_qItems.end(); ++i)
     {
@@ -385,16 +385,16 @@ void QuestMenu::ClearMenu()
     m_qItems.clear();
 }
 
-void PlayerMenu::SendQuestGiverQuestList( QEmote eEmote, const std::string& Title, uint64 npcGUID )
+void PlayerMenu::SendQuestGiverQuestList(QEmote eEmote, const std::string& Title, uint64 npcGUID)
 {
-    WorldPacket data( SMSG_QUESTGIVER_QUEST_LIST, 100 );    // guess size
+    WorldPacket data(SMSG_QUESTGIVER_QUEST_LIST, 100);    // guess size
     data << uint64(npcGUID);
     data << Title;
-    data << uint32(eEmote._Delay );                         // player emote
-    data << uint32(eEmote._Emote );                         // NPC emote
-    data << uint8 ( mQuestMenu.MenuItemCount() );
+    data << uint32(eEmote._Delay);                         // player emote
+    data << uint32(eEmote._Emote);                         // NPC emote
+    data << uint8 (mQuestMenu.MenuItemCount());
 
-    for (uint32 iI = 0; iI < mQuestMenu.MenuItemCount(); ++iI )
+    for (uint32 iI = 0; iI < mQuestMenu.MenuItemCount(); ++iI)
     {
         QuestMenuItem const& qmi = mQuestMenu.GetItem(iI);
 
@@ -418,21 +418,21 @@ void PlayerMenu::SendQuestGiverQuestList( QEmote eEmote, const std::string& Titl
         data << uint32(pSession->GetPlayer()->GetQuestLevel(pQuest));
         data << title;
     }
-    pSession->SendPacket( &data );
+    pSession->SendPacket(&data);
     sLog.outDebug("WORLD: Sent SMSG_QUESTGIVER_QUEST_LIST NPC Guid=%u", GUID_LOPART(npcGUID));
 }
 
-void PlayerMenu::SendQuestGiverStatus( uint8 questStatus, uint64 npcGUID )
+void PlayerMenu::SendQuestGiverStatus(uint8 questStatus, uint64 npcGUID)
 {
-    WorldPacket data( SMSG_QUESTGIVER_STATUS, 9 );
+    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);
+    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 )
+void PlayerMenu::SendQuestGiverQuestDetails(Quest const *pQuest, uint64 npcGUID, bool ActivateAccept)
 {
     std::string Title      = pQuest->GetTitle();
     std::string Details    = pQuest->GetDetails();
@@ -482,24 +482,24 @@ void PlayerMenu::SendQuestGiverQuestDetails( Quest const *pQuest, uint64 npcGUID
         data << uint32(pQuest->GetRewChoiceItemsCount());
         for (uint32 i=0; i < QUEST_REWARD_CHOICES_COUNT; ++i)
         {
-            if ( !pQuest->RewChoiceItemId[i] ) continue;
+            if (!pQuest->RewChoiceItemId[i]) continue;
             data << uint32(pQuest->RewChoiceItemId[i]);
             data << uint32(pQuest->RewChoiceItemCount[i]);
             IProto = objmgr.GetItemPrototype(pQuest->RewChoiceItemId[i]);
-            if ( IProto )
+            if (IProto)
                 data << uint32(IProto->DisplayInfoID);
             else
-                data << uint32( 0x00 );
+                data << uint32(0x00);
         }
 
         data << uint32(pQuest->GetRewItemsCount());
         for (uint32 i=0; i < QUEST_REWARDS_COUNT; ++i)
         {
-            if ( !pQuest->RewItemId[i] ) continue;
+            if (!pQuest->RewItemId[i]) continue;
             data << uint32(pQuest->RewItemId[i]);
             data << uint32(pQuest->RewItemCount[i]);
             IProto = objmgr.GetItemPrototype(pQuest->RewItemId[i]);
-            if ( IProto )
+            if (IProto)
                 data << uint32(IProto->DisplayInfoID);
             else
                 data << uint32(0);
@@ -534,12 +534,12 @@ void PlayerMenu::SendQuestGiverQuestDetails( Quest const *pQuest, uint64 npcGUID
         data << uint32(pQuest->DetailsEmote[i]);
         data << uint32(pQuest->DetailsEmoteDelay[i]);       // DetailsEmoteDelay (in ms)
     }
-    pSession->SendPacket( &data );
+    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 )
+void PlayerMenu::SendQuestQueryResponse(Quest const *pQuest)
 {
     std::string Title, Details, Objectives, EndText, CompletedText;
     std::string ObjectiveText[QUEST_OBJECTIVES_COUNT];
@@ -574,7 +574,7 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest )
         }
     }
 
-    WorldPacket data( SMSG_QUEST_QUERY_RESPONSE, 100 );     // guess size
+    WorldPacket data(SMSG_QUEST_QUERY_RESPONSE, 100);     // guess size
 
     data << uint32(pQuest->GetQuestId());                   // quest id
     data << uint32(pQuest->GetQuestMethod());               // Accepted values: 0, 1 or 2. 0==IsAutoComplete() (skip objectives/details)
@@ -682,11 +682,11 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest )
     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() );
+    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 )
+void PlayerMenu::SendQuestGiverOfferReward(Quest const* pQuest, uint64 npcGUID, bool EnableNext)
 {
     std::string Title = pQuest->GetTitle();
     std::string OfferRewardText = pQuest->GetOfferRewardText();
@@ -704,7 +704,7 @@ void PlayerMenu::SendQuestGiverOfferReward( Quest const* pQuest, uint64 npcGUID,
         }
     }
 
-    WorldPacket data( SMSG_QUESTGIVER_OFFER_REWARD, 50 );   // guess size
+    WorldPacket data(SMSG_QUESTGIVER_OFFER_REWARD, 50);   // guess size
 
     data << uint64(npcGUID);
     data << uint32(pQuest->GetQuestId());
@@ -734,12 +734,12 @@ void PlayerMenu::SendQuestGiverOfferReward( Quest const* pQuest, uint64 npcGUID,
     data << uint32(pQuest->GetRewChoiceItemsCount());
     for (uint32 i=0; i < pQuest->GetRewChoiceItemsCount(); ++i)
     {
-        pItem = objmgr.GetItemPrototype( pQuest->RewChoiceItemId[i] );
+        pItem = objmgr.GetItemPrototype(pQuest->RewChoiceItemId[i]);
 
         data << uint32(pQuest->RewChoiceItemId[i]);
         data << uint32(pQuest->RewChoiceItemCount[i]);
 
-        if ( pItem )
+        if (pItem)
             data << uint32(pItem->DisplayInfoID);
         else
             data << uint32(0);
@@ -752,7 +752,7 @@ void PlayerMenu::SendQuestGiverOfferReward( Quest const* pQuest, uint64 npcGUID,
         data << uint32(pQuest->RewItemId[i]);
         data << uint32(pQuest->RewItemCount[i]);
 
-        if ( pItem )
+        if (pItem)
             data << uint32(pItem->DisplayInfoID);
         else
             data << uint32(0);
@@ -781,11 +781,11 @@ void PlayerMenu::SendQuestGiverOfferReward( Quest const* pQuest, uint64 npcGUID,
     for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)        // reward reputation override?
         data << uint32(pQuest->RewRepValue[i]);
 
-    pSession->SendPacket( &data );
-    sLog.outDebug( "WORLD: Sent SMSG_QUESTGIVER_OFFER_REWARD NPCGuid=%u, questid=%u", GUID_LOPART(npcGUID), pQuest->GetQuestId() );
+    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 )
+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
@@ -812,7 +812,7 @@ void PlayerMenu::SendQuestGiverRequestItems( Quest const *pQuest, uint64 npcGUID
         return;
     }
 
-    WorldPacket data( SMSG_QUESTGIVER_REQUEST_ITEMS, 50 );  // guess size
+    WorldPacket data(SMSG_QUESTGIVER_REQUEST_ITEMS, 50);  // guess size
     data << npcGUID;
     data << pQuest->GetQuestId();
     data << Title;
@@ -836,22 +836,22 @@ void PlayerMenu::SendQuestGiverRequestItems( Quest const *pQuest, uint64 npcGUID
     // Required Money
     data << uint32(pQuest->GetRewOrReqMoney() < 0 ? -pQuest->GetRewOrReqMoney() : 0);
 
-    data << uint32( pQuest->GetReqItemsCount() );
+    data << uint32(pQuest->GetReqItemsCount());
     ItemPrototype const *pItem;
     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]);
 
-        if ( pItem )
+        if (pItem)
             data << uint32(pItem->DisplayInfoID);
         else
             data << uint32(0);
     }
 
-    if ( !Completable )
+    if (!Completable)
         data << uint32(0x00);
     else
         data << uint32(0x03);
@@ -860,6 +860,6 @@ void PlayerMenu::SendQuestGiverRequestItems( Quest const *pQuest, uint64 npcGUID
     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() );
+    pSession->SendPacket(&data);
+    sLog.outDebug("WORLD: Sent SMSG_QUESTGIVER_REQUEST_ITEMS NPCGuid=%u, questid=%u", GUID_LOPART(npcGUID), pQuest->GetQuestId());
 }