summaryrefslogtreecommitdiff
path: root/src/net/ea
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-03 12:51:52 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-06 01:18:56 +0300
commitbfa9351f768f20b591cccdbb24eb546dfb59e27d (patch)
treeed5b33755ee7ed29063e362d3a063704678a4c4e /src/net/ea
parentafb32d7896cf03603d15802bc237fc53f7681444 (diff)
downloadmv-bfa9351f768f20b591cccdbb24eb546dfb59e27d.tar.gz
mv-bfa9351f768f20b591cccdbb24eb546dfb59e27d.tar.bz2
mv-bfa9351f768f20b591cccdbb24eb546dfb59e27d.tar.xz
mv-bfa9351f768f20b591cccdbb24eb546dfb59e27d.zip
move processPlayerInventoryAdd from ea namespace into tmwa and eathena.
Diffstat (limited to 'src/net/ea')
-rw-r--r--src/net/ea/inventoryhandler.cpp67
-rw-r--r--src/net/ea/inventoryhandler.h2
2 files changed, 0 insertions, 69 deletions
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index fb651ae25..0cc84d7ae 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -283,73 +283,6 @@ void InventoryHandler::processPlayerStorageEquip(Net::MessageIn &msg)
BLOCK_END("InventoryHandler::processPlayerStorageEquip")
}
-void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg)
-{
- BLOCK_START("InventoryHandler::processPlayerInventoryAdd")
- Inventory *const inventory = localPlayer
- ? PlayerInfo::getInventory() : nullptr;
-
- if (PlayerInfo::getEquipment()
- && !PlayerInfo::getEquipment()->getBackend())
- { // look like SMSG_PLAYER_INVENTORY was not received
- mEquips.clear();
- PlayerInfo::getEquipment()->setBackend(&mEquips);
- }
- const int index = msg.readInt16() - INVENTORY_OFFSET;
- int amount = msg.readInt16();
- const int itemId = msg.readInt16();
- uint8_t identified = msg.readUInt8();
- msg.readUInt8(); // attribute
- const uint8_t refine = msg.readUInt8();
- for (int i = 0; i < 4; i++)
- msg.readInt16(); // cards[i]
- const int equipType = msg.readInt16();
- msg.readUInt8(); // itemType
-
- const ItemInfo &itemInfo = ItemDB::get(itemId);
- const unsigned char err = msg.readUInt8();
- int floorId;
- if (mSentPickups.empty())
- {
- floorId = 0;
- }
- else
- {
- floorId = mSentPickups.front();
- mSentPickups.pop();
- }
-
- if (err)
- {
- if (localPlayer)
- localPlayer->pickedUp(itemInfo, 0, identified, floorId, err);
- }
- else
- {
- if (localPlayer)
- {
- localPlayer->pickedUp(itemInfo, amount,
- identified, floorId, Pickup::OKAY);
- }
-
- if (inventory)
- {
- const Item *const item = inventory->getItem(index);
-
- if (item && item->getId() == itemId)
- amount += item->getQuantity();
-
- if (serverVersion < 1 && identified > 1)
- identified = 1;
-
- inventory->setItem(index, itemId, amount, refine,
- identified, equipType != 0);
- }
- ArrowsListener::distributeEvent();
- }
- BLOCK_END("InventoryHandler::processPlayerInventoryAdd")
-}
-
void InventoryHandler::processPlayerInventoryRemove(Net::MessageIn &msg)
{
BLOCK_START("InventoryHandler::processPlayerInventoryRemove")
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index b45c4e337..7afd688dc 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -84,8 +84,6 @@ class InventoryHandler notfinal : public Net::InventoryHandler
void processPlayerStorageEquip(Net::MessageIn &msg);
- void processPlayerInventoryAdd(Net::MessageIn &msg);
-
static void processPlayerInventoryRemove(Net::MessageIn &msg);
static void processPlayerInventoryUse(Net::MessageIn &msg);