diff options
| author | David Athay <dathay@mini1.local> | 2011-04-06 19:24:23 -0500 |
|---|---|---|
| committer | David Athay <dathay@mini1.local> | 2011-04-06 19:24:23 -0500 |
| commit | 701a8d8bf4fe2d286c2ffa39efa8b80e6c85ff01 (patch) | |
| tree | 4f01225b6a3958ce9361fe60533a19d6d522ed48 /src/net/tmwa/inventoryhandler.cpp | |
| parent | 66bd56ebec2bff48fb1484603b41643fd89bf4d6 (diff) | |
| parent | b6f3db30c595d8e89572c78eb82b9823b8491c54 (diff) | |
| download | mana-client-701a8d8bf4fe2d286c2ffa39efa8b80e6c85ff01.tar.gz mana-client-701a8d8bf4fe2d286c2ffa39efa8b80e6c85ff01.tar.bz2 mana-client-701a8d8bf4fe2d286c2ffa39efa8b80e6c85ff01.tar.xz mana-client-701a8d8bf4fe2d286c2ffa39efa8b80e6c85ff01.zip | |
Merge branch '0.5' of git://gitorious.org/mana/mana into 0.5
Diffstat (limited to 'src/net/tmwa/inventoryhandler.cpp')
| -rw-r--r-- | src/net/tmwa/inventoryhandler.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp index 3809399d..5e404e6c 100644 --- a/src/net/tmwa/inventoryhandler.cpp +++ b/src/net/tmwa/inventoryhandler.cpp @@ -230,13 +230,14 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg) { const ItemInfo &itemInfo = ItemDB::get(itemId); - if (msg.readInt8() > 0) + unsigned char err = msg.readInt8(); + if (err) { - player_node->pickedUp(itemInfo, 0); + player_node->pickedUp(itemInfo, 0, err); } else { - player_node->pickedUp(itemInfo, amount); + player_node->pickedUp(itemInfo, amount, PICKUP_OKAY); Item *item = inventory->getItem(index); |