Core/PacketIO: Migrate CMSG_INSPECT, SMSG_INSPECT_TALENT and SMSG_TALENTS_INFO to packet classes

Author: Shauren

src/server/game/Entities/Pet/Pet.cpp

@@ -1712,7 +1712,7 @@ bool Pet::resetTalents(bool involuntarily /*= false*/)
         player->PetSpellInitialize();
 
     if (involuntarily)
-        player->SendDirectMessage(WorldPackets::Talents::InvoluntarilyReset(true).Write());
+        player->SendDirectMessage(WorldPackets::Talent::InvoluntarilyReset(true).Write());
 
     return true;
 }
@@ -1751,7 +1751,7 @@ void Pet::resetTalentsForAllPetsOf(Player* owner, Pet* onlinePet /*= nullptr*/,
         return;
 
     if (!onlinePet)
-        owner->SendDirectMessage(WorldPackets::Talents::InvoluntarilyReset(true).Write());
+        owner->SendDirectMessage(WorldPackets::Talent::InvoluntarilyReset(true).Write());
 
     bool need_comma = false;
     std::ostringstream ss;

src/server/game/Entities/Player/Player.cpp

@@ -3780,7 +3780,7 @@ bool Player::ResetTalents(bool involuntarily /*= false*/)
     SetFreeTalentPoints(talentPointsForLevel);
 
     if (involuntarily)
-        SendDirectMessage(WorldPackets::Talents::InvoluntarilyReset(false).Write());
+        SendDirectMessage(WorldPackets::Talent::InvoluntarilyReset(false).Write());
 
     return true;
 }
@@ -9179,7 +9179,7 @@ void Player::SetBindPoint(ObjectGuid guid) const
 
 void Player::SendTalentWipeConfirm(ObjectGuid trainerGuid) const
 {
-    SendDirectMessage(WorldPackets::Talents::RespecWipeConfirm(trainerGuid, ResetTalentsCost()).Write());
+    SendDirectMessage(WorldPackets::Talent::RespecWipeConfirm(trainerGuid, ResetTalentsCost()).Write());
 }
 
 void Player::ResetPetTalents()
@@ -25275,11 +25275,11 @@ bool Player::CanSeeSpellClickOn(Creature const* c) const
     return false;
 }
 
-void Player::BuildPlayerTalentsInfoData(WorldPacket* data)
+void Player::BuildPlayerTalentsInfoData(WorldPackets::Talent::TalentInfoUpdate& talentInfo)
 {
-    *data << uint32(GetFreeTalentPoints());                 // unspentTalentPoints
-    *data << uint8(GetSpecsCount());                        // talent group count (0, 1 or 2)
-    *data << uint8(GetActiveSpec());                        // talent group index (0 or 1)
+    talentInfo.UnspentTalentPoints = GetFreeTalentPoints(); // unspentTalentPoints
+    talentInfo.TalentGroups.resize(GetSpecsCount());        // talent group count (0, 1 or 2)
+    talentInfo.ActiveGroup = GetActiveSpec();               // talent group index (0 or 1)
 
     if (GetSpecsCount())
     {
@@ -25289,9 +25289,7 @@ void Player::BuildPlayerTalentsInfoData(WorldPacket* data)
         // loop through all specs (only 1 for now)
         for (uint32 specIdx = 0; specIdx < GetSpecsCount(); ++specIdx)
         {
-            uint8 talentIdCount = 0;
-            size_t pos = data->wpos();
-            *data << uint8(talentIdCount);                  // [PH], talentIdCount
+            WorldPackets::Talent::TalentGroupInfo& talentGroupInfo = talentInfo.TalentGroups[specIdx];
 
             // find class talent tabs (all players have 3 talent tabs)
             uint32 const* talentTabIds = GetTalentTabPages(GetClass());
@@ -25302,19 +25300,19 @@ void Player::BuildPlayerTalentsInfoData(WorldPacket* data)
 
                 for (uint32 talentId = 0; talentId < sTalentStore.GetNumRows(); ++talentId)
                 {
-                    TalentEntry const* talentInfo = sTalentStore.LookupEntry(talentId);
-                    if (!talentInfo)
+                    TalentEntry const* talent = sTalentStore.LookupEntry(talentId);
+                    if (!talent)
                         continue;
 
                     // skip another tab talents
-                    if (talentInfo->TabID != talentTabId)
+                    if (talent->TabID != talentTabId)
                         continue;
 
                     // find max talent rank (0~4)
                     int8 curtalent_maxrank = -1;
-                    for (int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank)
+                    for (int8 rank = MAX_TALENT_RANK - 1; rank >= 0; --rank)
                     {
-                        if (talentInfo->SpellRank[rank] && HasTalent(talentInfo->SpellRank[rank], specIdx))
+                        if (talent->SpellRank[rank] && HasTalent(talent->SpellRank[rank], specIdx))
                         {
                             curtalent_maxrank = rank;
                             break;
@@ -25325,40 +25323,23 @@ void Player::BuildPlayerTalentsInfoData(WorldPacket* data)
                     if (curtalent_maxrank < 0)
                         continue;
 
-                    *data << uint32(talentInfo->ID);  // Talent.dbc
-                    *data << uint8(curtalent_maxrank);      // talentMaxRank (0-4)
-
-                    ++talentIdCount;
+                    talentGroupInfo.Talents.push_back({ .TalentID = talent->ID, .Rank = curtalent_maxrank });
                 }
             }
 
-            data->put<uint8>(pos, talentIdCount);           // put real count
-
-            *data << uint8(MAX_GLYPH_SLOT_INDEX);           // glyphs count
-
             for (uint8 i = 0; i < MAX_GLYPH_SLOT_INDEX; ++i)
-                *data << uint16(GetGlyph(specIdx, i));               // GlyphProperties.dbc
+                talentGroupInfo.GlyphIDs[i] = GetGlyph(specIdx, i);  // GlyphProperties.dbc
         }
     }
 }
 
-void Player::BuildPetTalentsInfoData(WorldPacket* data)
+void Player::BuildPetTalentsInfoData(WorldPackets::Talent::PetTalentInfoUpdate& petTalentInfo) const
 {
-    uint32 unspentTalentPoints = 0;
-    size_t pointsPos = data->wpos();
-    *data << uint32(unspentTalentPoints);                   // [PH], unspentTalentPoints
-
-    uint8 talentIdCount = 0;
-    size_t countPos = data->wpos();
-    *data << uint8(talentIdCount);                          // [PH], talentIdCount
-
     Pet* pet = GetPet();
     if (!pet)
         return;
 
-    unspentTalentPoints = pet->GetFreeTalentPoints();
-
-    data->put<uint32>(pointsPos, unspentTalentPoints);      // put real points
+    petTalentInfo.UnspentTalentPoints = pet->GetFreeTalentPoints();
 
     CreatureTemplate const* ci = pet->GetCreatureTemplate();
     if (!ci)
@@ -25379,19 +25360,19 @@ void Player::BuildPetTalentsInfoData(WorldPacket* data)
 
         for (uint32 talentId = 0; talentId < sTalentStore.GetNumRows(); ++talentId)
         {
-            TalentEntry const* talentInfo = sTalentStore.LookupEntry(talentId);
-            if (!talentInfo)
+            TalentEntry const* talent = sTalentStore.LookupEntry(talentId);
+            if (!talent)
                 continue;
 
             // skip another tab talents
-            if (talentInfo->TabID != talentTabId)
+            if (talent->TabID != talentTabId)
                 continue;
 
             // find max talent rank (0~4)
             int8 curtalent_maxrank = -1;
-            for (int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank)
+            for (int8 rank = MAX_TALENT_RANK - 1; rank >= 0; --rank)
             {
-                if (talentInfo->SpellRank[rank] && pet->HasSpell(talentInfo->SpellRank[rank]))
+                if (talent->SpellRank[rank] && pet->HasSpell(talent->SpellRank[rank]))
                 {
                     curtalent_maxrank = rank;
                     break;
@@ -25402,70 +25383,23 @@ void Player::BuildPetTalentsInfoData(WorldPacket* data)
             if (curtalent_maxrank < 0)
                 continue;
 
-            *data << uint32(talentInfo->ID);          // Talent.dbc
-            *data << uint8(curtalent_maxrank);              // talentMaxRank (0-4)
-
-            ++talentIdCount;
+            petTalentInfo.Talents.push_back({ .TalentID = talent->ID, .Rank = curtalent_maxrank });
         }
 
-        data->put<uint8>(countPos, talentIdCount);          // put real count
-
         break;
     }
 }
 
 void Player::SendTalentsInfoData(bool pet)
 {
-    WorldPacket data(SMSG_TALENTS_INFO, 50);
-    data << uint8(pet ? 1 : 0);
+    WorldPackets::Talent::UpdateTalentData updateTalentData;
+
     if (pet)
-        BuildPetTalentsInfoData(&data);
+        BuildPetTalentsInfoData(updateTalentData.Info.emplace<1>());
     else
-        BuildPlayerTalentsInfoData(&data);
-    SendDirectMessage(&data);
-}
-
-void Player::BuildEnchantmentsInfoData(WorldPacket* data)
-{
-    uint32 slotUsedMask = 0;
-    size_t slotUsedMaskPos = data->wpos();
-    *data << uint32(slotUsedMask);                          // slotUsedMask < 0x80000
-
-    for (uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i)
-    {
-        Item* item = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
-
-        if (!item)
-            continue;
-
-        slotUsedMask |= (1 << i);
-
-        *data << uint32(item->GetEntry());                  // item entry
-
-        uint16 enchantmentMask = 0;
-        size_t enchantmentMaskPos = data->wpos();
-        *data << uint16(enchantmentMask);                   // enchantmentMask < 0x1000
-
-        for (uint32 j = 0; j < MAX_ENCHANTMENT_SLOT; ++j)
-        {
-            uint32 enchId = item->GetEnchantmentId(EnchantmentSlot(j));
-
-            if (!enchId)
-                continue;
-
-            enchantmentMask |= (1 << j);
-
-            *data << uint16(enchId);                        // enchantmentId?
-        }
-
-        data->put<uint16>(enchantmentMaskPos, enchantmentMask);
-
-        *data << int16(item->GetItemRandomPropertyId());                 // Random item property id
-        *data << item->GetGuidValue(ITEM_FIELD_CREATOR).WriteAsPacked(); // item creator
-        *data << uint32(item->GetItemSuffixFactor());                    // SuffixFactor
-    }
+        BuildPlayerTalentsInfoData(updateTalentData.Info.emplace<0>());
 
-    data->put<uint32>(slotUsedMaskPos, slotUsedMask);
+    SendDirectMessage(updateTalentData.Write());
 }
 
 void Player::SendEquipmentSetList()

src/server/game/Entities/Player/Player.h

@@ -86,6 +86,12 @@ namespace WorldPackets
     {
         struct CharacterCreateInfo;
     }
+
+    namespace Talent
+    {
+        struct PetTalentInfoUpdate;
+        struct TalentInfoUpdate;
+    }
 }
 
 typedef std::deque<Mail*> PlayerMails;
@@ -1224,7 +1230,6 @@ class TC_GAME_API Player : public Unit, public GridObject<Player>
         void ApplyEnchantment(Item* item, bool apply);
         void UpdateSkillEnchantments(uint16 skill_id, uint16 curr_value, uint16 new_value);
         void SendEnchantmentDurations();
-        void BuildEnchantmentsInfoData(WorldPacket* data);
         void AddItemDurations(Item* item);
         void RemoveItemDurations(Item* item);
         void SendItemDurations();
@@ -1501,8 +1506,8 @@ class TC_GAME_API Player : public Unit, public GridObject<Player>
         uint32 ResetTalentsCost() const;
         void IncreaseResetTalentsCostAndCounters(uint32 lastResetTalentsCost);
         void InitTalentForLevel();
-        void BuildPlayerTalentsInfoData(WorldPacket* data);
-        void BuildPetTalentsInfoData(WorldPacket* data);
+        void BuildPlayerTalentsInfoData(WorldPackets::Talent::TalentInfoUpdate& talentInfo);
+        void BuildPetTalentsInfoData(WorldPackets::Talent::PetTalentInfoUpdate& petTalentInfo) const;
         void SendTalentsInfoData(bool pet);
         bool LearnTalent(uint32 talentId, uint32 talentRank);
         void LearnPetTalent(ObjectGuid petGuid, uint32 talentId, uint32 talentRank);

src/server/game/Handlers/MiscHandler.cpp

@@ -33,6 +33,7 @@
 #include "GossipDef.h"
 #include "Group.h"
 #include "GuildMgr.h"
+#include "InspectPackets.h"
 #include "Language.h"
 #include "Log.h"
 #include "MapManager.h"
@@ -913,42 +914,39 @@ void WorldSession::HandlePlayedTime(WorldPackets::Character::PlayedTimeClient& p
     SendPacket(playedTime.Write());
 }
 
-void WorldSession::HandleInspectOpcode(WorldPacket& recvData)
+void WorldSession::HandleInspectOpcode(WorldPackets::Inspect::Inspect& inspect)
 {
-    ObjectGuid guid;
-    recvData >> guid;
-
-    TC_LOG_DEBUG("network", "WORLD: Received CMSG_INSPECT");
-
-    Player* player = ObjectAccessor::GetPlayer(*_player, guid);
+    Player* player = ObjectAccessor::GetPlayer(*_player, inspect.Target);
     if (!player)
     {
-        TC_LOG_DEBUG("network", "CMSG_INSPECT: No player found from {}", guid.ToString());
+        TC_LOG_DEBUG("network", "CMSG_INSPECT: No player found from {}", inspect.Target.ToString());
         return;
     }
 
+    TC_LOG_DEBUG("network", "WorldSession::HandleInspectOpcode: Target {}.", inspect.Target.ToString());
+
     if (!GetPlayer()->IsWithinDistInMap(player, INSPECT_DISTANCE, false))
         return;
 
     if (GetPlayer()->IsValidAttackTarget(player))
         return;
 
-    uint32 talent_points = 0x47;
-    uint32 guid_size = player->GetPackGUID().size();
-    WorldPacket data(SMSG_INSPECT_TALENT, guid_size+4+talent_points);
-    data << player->GetPackGUID();
+    WorldPackets::Inspect::InspectResult inspectResult;
+    inspectResult.InspecteeGUID = inspect.Target;
 
-    if (GetPlayer()->CanBeGameMaster() || sWorld->getIntConfig(CONFIG_TALENTS_INSPECTING) + (GetPlayer()->GetTeamId() == player->GetTeamId()) > 1)
-        player->BuildPlayerTalentsInfoData(&data);
-    else
+    for (uint8 i = 0; i < EQUIPMENT_SLOT_END; ++i)
     {
-        data << uint32(0);                                  // unspentTalentPoints
-        data << uint8(0);                                   // talentGroupCount
-        data << uint8(0);                                   // talentGroupIndex
+        if (Item* item = player->GetItemByPos(INVENTORY_SLOT_BAG_0, i))
+        {
+            inspectResult.ItemSlots[i] = true;
+            inspectResult.Items.emplace_back(item);
+        }
     }
 
-    player->BuildEnchantmentsInfoData(&data);
-    SendPacket(&data);
+    if (GetPlayer()->CanBeGameMaster() || sWorld->getIntConfig(CONFIG_TALENTS_INSPECTING) + (GetPlayer()->GetTeamId() == player->GetTeamId()) > 1)
+        player->BuildPlayerTalentsInfoData(inspectResult.TalentInfo);
+
+    SendPacket(inspectResult.Write());
 }
 
 void WorldSession::HandleInspectHonorStatsOpcode(WorldPacket& recvData)

src/server/game/Handlers/SkillHandler.cpp

@@ -62,7 +62,7 @@ void WorldSession::HandleLearnPreviewTalents(WorldPacket& recvPacket)
     recvPacket.rfinish();
 }
 
-void WorldSession::HandleTalentWipeConfirmOpcode(WorldPackets::Talents::ConfirmRespecWipe& confirmRespecWipe)
+void WorldSession::HandleTalentWipeConfirmOpcode(WorldPackets::Talent::ConfirmRespecWipe& confirmRespecWipe)
 {
     TC_LOG_DEBUG("network", "MSG_TALENT_WIPE_CONFIRM");
 

src/server/game/Server/Packets/AllPackets.h

@@ -28,6 +28,7 @@
 #include "CombatLogPackets.h"
 #include "CombatPackets.h"
 #include "GuildPackets.h"
+#include "InspectPackets.h"
 #include "LFGPackets.h"
 #include "MailPackets.h"
 #include "MiscPackets.h"

src/server/game/Server/Packets/CharacterPackets.h

@@ -22,6 +22,7 @@
 #include "ObjectGuid.h"
 #include "Position.h"
 #include "SharedDefines.h"
+#include <memory>
 
 namespace WorldPackets
 {