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, 17 insertions, 1 deletions

diff --git a/src/localplayer.h b/src/localplayer.h
index a5328182..b1a41697 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -45,6 +45,21 @@ class AwayListener : public gcn::ActionListener
 };
 
 /**
+ * Reasons an item can fail to be picked up.
+ */
+enum
+{
+    PICKUP_OKAY,
+    PICKUP_BAD_ITEM,
+    PICKUP_TOO_HEAVY,
+    PICKUP_TOO_FAR,
+    PICKUP_INV_FULL,
+    PICKUP_STACK_FULL,
+    PICKUP_DROP_STEAL,
+};
+
+
+/**
  * The local player character.
  */
 class LocalPlayer : public Being
@@ -168,7 +183,8 @@ class LocalPlayer : public Being
         /**
          * Shows item pickup notifications.
          */
-        void pickedUp(const ItemInfo &itemInfo, int amount);
+        void pickedUp(const ItemInfo &itemInfo, int amount,
+                      unsigned char fail);
 
         void setShowIp(bool show)
         { mShowIp = show; }