Changeset 6 for trunk/src/game/GossipDef.cpp

Timestamp:

11/19/08 13:22:12 (17 years ago)

Author:

yumileroy

Message:

[svn] * Added ACE for Linux and Windows (Thanks Derex for Linux part and partial Windows part)
* Updated to 6721 and 676
* Fixed TrinityScript? logo
* Version updated to 0.2.6721.676

Original author: Neo2003
Date: 2008-10-04 06:17:19-05:00

Files:

• trunk/src/game/GossipDef.cpp (modified) (4 diffs)

trunk/src/game/GossipDef.cpp

@@ -92 +92 @@
 }
 
-PlayerMenu::PlayerMenu( WorldSession *Session )
-{
-    pGossipMenu = new GossipMenu();
-    pQuestMenu  = new QuestMenu();
-    pSession    = Session;
+PlayerMenu::PlayerMenu( WorldSession *session ) : pSession(session)
+{
 }
 
 PlayerMenu::~PlayerMenu()
 {
-    delete pGossipMenu;
-    delete pQuestMenu;
+    ClearMenus();
 }
 
 void PlayerMenu::ClearMenus()
 {
-    pGossipMenu->ClearMenu();
-    pQuestMenu->ClearMenu();
+    mGossipMenu.ClearMenu();
+    mQuestMenu.ClearMenu();
 }
 
 uint32 PlayerMenu::GossipOptionSender( unsigned int Selection )
 {
-    return pGossipMenu->MenuItemSender( Selection );
+    return mGossipMenu.MenuItemSender( Selection );
 }
 
 uint32 PlayerMenu::GossipOptionAction( unsigned int Selection )
 {
-    return pGossipMenu->MenuItemAction( Selection );
+    return mGossipMenu.MenuItemAction( Selection );
 }
 
 bool PlayerMenu::GossipOptionCoded( unsigned int Selection )
 {
-    return pGossipMenu->MenuItemCoded( Selection );
+    return mGossipMenu.MenuItemCoded( Selection );
 }
 
@@ -132 +128 @@
     data << uint32(0);                                      // new 2.4.0
     data << uint32( TitleTextId );
-    data << uint32( pGossipMenu->MenuItemCount() );         // max count 0x0F
-
-    for ( unsigned int iI = 0; iI < pGossipMenu->MenuItemCount(); iI++ )
-    {
-        GossipMenuItem const& gItem = pGossipMenu->GetItem(iI);
+    data << uint32( mGossipMenu.MenuItemCount() );         // max count 0x0F
+
+    for ( unsigned int iI = 0; iI < mGossipMenu.MenuItemCount(); iI++ )
+    {
+        GossipMenuItem const& gItem = mGossipMenu.GetItem(iI);
         data << uint32( iI );
         data << uint8( gItem.m_gIcon );
@@ -151 +147 @@
     }
 
-    data << uint32( pQuestMenu->MenuItemCount() );          // max count 0x20
-
-    for ( uint16 iI = 0; iI < pQuestMenu->MenuItemCount(); iI++ )
-    {
-        QuestMenuItem const& qItem = pQuestMenu->GetItem(iI);
+    data << uint32( mQuestMenu.MenuItemCount() );          // max count 0x20
+
+    for ( uint16 iI = 0; iI < mQuestMenu.MenuItemCount(); iI++ )
+    {
+        QuestMenuItem const& qItem = mQuestMenu.GetItem(iI);
         uint32 questID = qItem.m_qId;
         Quest const* pQuest = objmgr.GetQuestTemplate(questID);
@@ -358 +354 @@
     data << uint32(eEmote._Delay );                         // player emote
     data << uint32(eEmote._Emote );                         // NPC emote
-    data << uint8 ( pQuestMenu->MenuItemCount() );
-
-    for ( uint16 iI = 0; iI < pQuestMenu->MenuItemCount(); iI++ )
-    {
-        QuestMenuItem qmi=pQuestMenu->GetItem(iI);
+    data << uint8 ( mQuestMenu.MenuItemCount() );
+
+    for ( uint16 iI = 0; iI < mQuestMenu.MenuItemCount(); iI++ )
+    {
+        QuestMenuItem const& qmi = mQuestMenu.GetItem(iI);
+
         uint32 questID = qmi.m_qId;
         Quest const *pQuest = objmgr.GetQuestTemplate(questID);