4 files changed, 5 insertions, 4 deletions
diff --git a/src/net/eathena/inventoryhandler.h b/src/net/eathena/inventoryhandler.h
index 8f144f57e..786917970 100644
--- a/src/net/eathena/inventoryhandler.h
+++ b/src/net/eathena/inventoryhandler.h
@@ -71,7 +71,8 @@ class InventoryHandler final : public Ea::InventoryHandler
 
         void identifyItem(const Item *const item) const override final;
 
-        void mergeItemsAck(const std::vector<Item*> &items) const override final;
+        void mergeItemsAck(const std::vector<Item*> &items) const
+                           override final;
 
         void mergetItemsCancel() const override final;
 
diff --git a/src/net/eathena/inventoryrecv.cpp b/src/net/eathena/inventoryrecv.cpp
index c3f752a6d..5ba7a81b3 100644
--- a/src/net/eathena/inventoryrecv.cpp
+++ b/src/net/eathena/inventoryrecv.cpp
@@ -1057,7 +1057,6 @@ void InventoryRecv::processPlayerCartEquip(Net::MessageIn &msg)
 
 void InventoryRecv::processPlayerCartItems(Net::MessageIn &msg)
 {
-//+++
     BLOCK_START("InventoryRecv::processPlayerCartItems")
     Ea::InventoryRecv::mInventoryItems.clear();
 
diff --git a/src/net/eathena/vendingrecv.cpp b/src/net/eathena/vendingrecv.cpp
index 4c609a766..4a342d8eb 100644
--- a/src/net/eathena/vendingrecv.cpp
+++ b/src/net/eathena/vendingrecv.cpp
@@ -89,7 +89,7 @@ void VendingRecv::processItemsList(Net::MessageIn &msg)
     if (msg.getVersion() >= 20100105)
         offset += 4;
 
-    const int count = (msg.readInt16("len") - offset) / 22;
+    const int count = (msg.readInt16("len") - offset) / packetLen;
     const BeingId id = msg.readBeingId("id");
     const Being *const being = actorManager->findBeing(id);
     if (!being)
diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h
index dfd2776da..1bbbf0f3b 100644
--- a/src/net/tmwa/inventoryhandler.h
+++ b/src/net/tmwa/inventoryhandler.h
@@ -71,7 +71,8 @@ class InventoryHandler final : public Ea::InventoryHandler
 
         void identifyItem(const Item *const item) const override final;
 
-        void mergeItemsAck(const std::vector<Item*> &items) const override final;
+        void mergeItemsAck(const std::vector<Item*> &items) const
+                           override final;
 
         void mergetItemsCancel() const override final;