Core/Packets: rename packet structs to match client names

2 files changed, 20 insertions, 8 deletions

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 1de521f30cd..648175308c6 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -13030,18 +13030,30 @@ void Player::RemoveItemFromBuyBackSlot(uint32 slot, bool del)
     }
 }
 
-void Player::SendEquipError(InventoryResult msg, Item* pItem, Item* pItem2, uint32 itemid)
+void Player::SendEquipError(InventoryResult msg, Item* item1 /*= nullptr*/, Item* item2 /*= nullptr*/, uint32 itemId /*= 0*/)
 {
     TC_LOG_DEBUG("network", "WORLD: Sent SMSG_INVENTORY_CHANGE_FAILURE (%u)", msg);
 
-    WorldPackets::Item::EquipError error;
-    error.msg = msg;
-    error.itemGUID1 = pItem ? pItem->GetGUID() : ObjectGuid::Empty;
-    error.itemGUID2 = pItem2 ? pItem2->GetGUID() : ObjectGuid::Empty;
+    WorldPackets::Item::InventoryChangeFailure failure;
+    failure.BagResult = msg;
 
-    error.level = uint32(pItem ? pItem->GetRequiredLevel() : 0);
+    if (item1)
+    {
+        failure.Item[0] = item1->GetGUID();
+        failure.Level = uint32(item1->GetRequiredLevel());
+    }
+
+    if (item2)
+        failure.Item[1] = item2->GetGUID();
+
+    /// @todo: fill remaining values:
+    /// ContainerBSlot
+    /// SrcContainer
+    /// DstContainer
+    /// SrcSlot
+    /// LimitCategory
 
-    GetSession()->SendPacket(error.Write());
+    SendDirectMessage(failure.Write());
 }
 
 void Player::SendBuyError(BuyResult msg, Creature* creature, uint32 item, uint32 /*param*/)
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index d0da77eb881..b4f3c67d8ca 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -1515,7 +1515,7 @@ class Player : public Unit, public GridObject<Player>
         void AddItemToBuyBackSlot(Item* pItem);
         Item* GetItemFromBuyBackSlot(uint32 slot);
         void RemoveItemFromBuyBackSlot(uint32 slot, bool del);
-        void SendEquipError(InventoryResult msg, Item* pItem, Item* pItem2 = NULL, uint32 itemid = 0);
+        void SendEquipError(InventoryResult msg, Item* item1 = nullptr, Item* item2 = nullptr, uint32 itemId = 0);
         void SendBuyError(BuyResult msg, Creature* creature, uint32 item, uint32 param);
         void SendSellError(SellResult msg, Creature* creature, ObjectGuid guid);
         void AddWeaponProficiency(uint32 newflag) { m_WeaponProficiency |= newflag; }