summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-10-20 12:45:11 +0300
committerAndrei Karas <akaras@inbox.ru>2014-10-20 12:45:11 +0300
commit12596b11b89baa167704d8cddd4599c937826062 (patch)
tree9b8c5063b97fff62e97d0bd96af680b181bf1e9e /src/net
parentfa378412565f98a1ce6d438425ca34b20aaf223a (diff)
downloadplus-12596b11b89baa167704d8cddd4599c937826062.tar.gz
plus-12596b11b89baa167704d8cddd4599c937826062.tar.bz2
plus-12596b11b89baa167704d8cddd4599c937826062.tar.xz
plus-12596b11b89baa167704d8cddd4599c937826062.zip
eathena: add some missing pickup statuses.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/eathena/inventoryhandler.cpp28
-rw-r--r--src/net/tmwa/inventoryhandler.cpp28
2 files changed, 54 insertions, 2 deletions
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index 8b75b1df9..b14bfbfb6 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -380,8 +380,34 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg)
if (err)
{
+ Pickup::Type pickup;
+ switch (err)
+ {
+ case 1:
+ pickup = Pickup::BAD_ITEM;
+ break;
+ case 2:
+ pickup = Pickup::TOO_HEAVY;
+ break;
+ case 4:
+ pickup = Pickup::INV_FULL;
+ break;
+ case 5:
+ pickup = Pickup::MAX_AMOUNT;
+ break;
+ case 6:
+ pickup = Pickup::TOO_FAR;
+ break;
+ case 7:
+ pickup = Pickup::STACK_AMOUNT;
+ break;
+ default:
+ pickup = Pickup::UNKNOWN;
+ logger->log("unknown pickup type: %d", err);
+ break;
+ }
if (localPlayer)
- localPlayer->pickedUp(itemInfo, 0, identified, floorId, err);
+ localPlayer->pickedUp(itemInfo, 0, identified, floorId, pickup);
}
else
{
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index d76f4b990..6cd74da5a 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -319,8 +319,34 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg)
if (err)
{
+ Pickup::Type pickup;
+ switch (err)
+ {
+ case 1:
+ pickup = Pickup::BAD_ITEM;
+ break;
+ case 2:
+ pickup = Pickup::TOO_HEAVY;
+ break;
+ case 3:
+ pickup = Pickup::TOO_FAR;
+ break;
+ case 4:
+ pickup = Pickup::INV_FULL;
+ break;
+ case 5:
+ pickup = Pickup::STACK_FULL;
+ break;
+ case 6:
+ pickup = Pickup::DROP_STEAL;
+ break;
+ default:
+ pickup = Pickup::UNKNOWN;
+ logger->log("unknown pickup type: %d", err);
+ break;
+ }
if (localPlayer)
- localPlayer->pickedUp(itemInfo, 0, identified, floorId, err);
+ localPlayer->pickedUp(itemInfo, 0, identified, floorId, pickup);
}
else
{