From bfa9351f768f20b591cccdbb24eb546dfb59e27d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 3 Sep 2014 12:51:52 +0300 Subject: move processPlayerInventoryAdd from ea namespace into tmwa and eathena. --- src/net/ea/inventoryhandler.cpp | 67 ----------------------------------------- src/net/ea/inventoryhandler.h | 2 -- 2 files changed, 69 deletions(-) (limited to 'src/net/ea') 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); -- cgit v1.2.3-70-g09d2