Merge branch '0.5'

Translation file updates ignored.

Conflicts:
	src/client.cpp
	src/commandhandler.cpp
	src/gui/popupmenu.cpp
	src/localplayer.cpp

1 files changed, 4 insertions, 3 deletions

diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index 4aedd9f2..1d99eca4 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -226,13 +226,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);