From 03763e4b290b80bc5606568b168f8605d7aa1631 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 29 Aug 2014 21:38:18 +0300 Subject: Remove additional parameters from processPlayerInventory function. --- src/net/ea/eaprotocol.h | 2 ++ src/net/ea/inventoryhandler.cpp | 4 ++-- src/net/ea/inventoryhandler.h | 3 +-- src/net/eathena/inventoryhandler.cpp | 2 +- src/net/tmwa/inventoryhandler.cpp | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src/net') diff --git a/src/net/ea/eaprotocol.h b/src/net/ea/eaprotocol.h index aeeebefde..401d09177 100644 --- a/src/net/ea/eaprotocol.h +++ b/src/net/ea/eaprotocol.h @@ -68,4 +68,6 @@ enum static const int INVENTORY_OFFSET = 2; static const int STORAGE_OFFSET = 1; +#define SMSG_PLAYER_INVENTORY 0x01ee + #endif // NET_EA_EAPROTOCOL_H diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index 432f4eb5c..c73dc5757 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -173,10 +173,10 @@ int InventoryHandler::getSlot(const int eAthenaSlot) return static_cast(EQUIP_POINTS[position]); } -void InventoryHandler::processPlayerInventory(Net::MessageIn &msg, - const bool playerInvintory) +void InventoryHandler::processPlayerInventory(Net::MessageIn &msg) { BLOCK_START("InventoryHandler::processPlayerInventory") + const bool playerInvintory = msg.getId() == SMSG_PLAYER_INVENTORY; Inventory *const inventory = localPlayer ? PlayerInfo::getInventory() : nullptr; if (playerInvintory) diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h index 76ceec765..3fe0ec6bb 100644 --- a/src/net/ea/inventoryhandler.h +++ b/src/net/ea/inventoryhandler.h @@ -80,8 +80,7 @@ class InventoryHandler notfinal : public Net::InventoryHandler static int getSlot(const int eAthenaSlot) A_WARN_UNUSED; - void processPlayerInventory(Net::MessageIn &msg, - const bool playerInvintory); + void processPlayerInventory(Net::MessageIn &msg); void processPlayerStorageEquip(Net::MessageIn &msg); diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp index df447c683..7e10bc69d 100644 --- a/src/net/eathena/inventoryhandler.cpp +++ b/src/net/eathena/inventoryhandler.cpp @@ -72,7 +72,7 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg) { case SMSG_PLAYER_INVENTORY: case SMSG_PLAYER_STORAGE_ITEMS: - processPlayerInventory(msg, msg.getId() == SMSG_PLAYER_INVENTORY); + processPlayerInventory(msg); break; case SMSG_PLAYER_STORAGE_EQUIP: diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp index 02413dafc..8d38d4feb 100644 --- a/src/net/tmwa/inventoryhandler.cpp +++ b/src/net/tmwa/inventoryhandler.cpp @@ -73,7 +73,7 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg) { case SMSG_PLAYER_INVENTORY: case SMSG_PLAYER_STORAGE_ITEMS: - processPlayerInventory(msg, msg.getId() == SMSG_PLAYER_INVENTORY); + processPlayerInventory(msg); break; case SMSG_PLAYER_STORAGE_EQUIP: -- cgit v1.2.3-70-g09d2