Applied patch by AHarrison that adds item pickup messages to the chat window.

3 files changed, 27 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index a6f5e4ab..b2d33b61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-27  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/net/inventoryhandler.cpp: Applied patch by AHarrison that adds
+	item pickup messages to the chat window.
+	* NEWS: Updated with some recently added and fixed issues. Doesn't
+	mention any of the recent content updates yet.
+
 2006-08-26  Pascal Ganaye <pascalganaye@users.sourceforge.net>
 
 	* src/joystick.h, src/joystick.cpp, src/gui/setup.cpp,
@@ -50,8 +57,8 @@
 
 2006-08-24  Frode Lindeijer  <f.lindeijer@gmail.com>
 
-	* data/graphics/sprites/item004.png, data/graphics/sprites/item005.png,
-	data/graphics/sprites/Makefile.am,
+	* data/graphics/sprites/item004.png,
+	data/graphics/sprites/item005.png, data/graphics/sprites/Makefile.am,
 	data/graphics/items/armor-legs-cottonshorts,
 	data/graphics/items/armor-legs-jeanshorts: Added the equip graphics of
 	the short jeans and the cotton shorts and an inventory icon of the
@@ -89,7 +96,7 @@
 	Added spotlight effect to the cave maps (feedback, please)
 	* data/graphics/maps/new_9-1.tmx.gz,
 	data/graphics/images/ambient/clouds.png:
-	Added cloudshadow effect to the woodland map (feedback, please)
+	Added cloudshadow effect to the woodland map (feedback, please).
 
 2006-08-20  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
diff --git a/NEWS b/NEWS
index ad78fc4f..cf837a25 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,12 @@
-0.0.20.1 (25 July 2006)
+0.0.21 (.. September 2006)
+- Added item pickup messages to the chat dialog
+- Added XP bar to ministatus in the top left
+- Added configurable smooth and lazy scrolling
+- Added option to turn off the joystick
+- Added --playername command line option for automatic character picking
 - Fixed updating system on Windows
+- Fixed player animations going out of sync on changing equipment or hairstyle
+- Fixed SDL_image configure check on some systems by first checking for libpng
 
 0.0.20 (24 July 2006)
 - Added new hairstyle, and some fixes to the old ones
diff --git a/src/net/inventoryhandler.cpp b/src/net/inventoryhandler.cpp
index 3742d327..a48ed51c 100644
--- a/src/net/inventoryhandler.cpp
+++ b/src/net/inventoryhandler.cpp
@@ -28,6 +28,7 @@
 #include "messagein.h"
 #include "protocol.h"
 
+#include "../resources/iteminfo.h"
 #include "../item.h"
 #include "../localplayer.h"
 
@@ -94,6 +95,14 @@ void InventoryHandler::handleMessage(MessageIn *msg)
             if (msg->readInt8()> 0) {
                 chatWindow->chatLog("Unable to pick up item", BY_SERVER);
             } else {
+                ItemInfo *itemInfo = itemDb->getItemInfo(itemId);
+                if (itemInfo) {
+                    chatWindow->chatLog("You picked up a " +
+                                        itemInfo->getName(), BY_SERVER);
+                } else {
+                    chatWindow->chatLog("You picked up an unknown item",
+                                        BY_SERVER);
+                }
                 player_node->addInvItem(index, itemId, amount, equipType != 0);
             }
             break;