From 666211542df4fd4fb0f9a1c936b54f6405ef09ba Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Mon, 13 Jul 2009 19:52:12 -0600
Subject: Some item pickup cleaning

Still need to find where to attach LocalPlayer::pickedUp for TMWServ.
---
 src/localplayer.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/localplayer.h')

diff --git a/src/localplayer.h b/src/localplayer.h
index 702ae38c..7fb43d3a 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -26,6 +26,7 @@
 #include <vector>
 
 #include "player.h"
+#include "gui/palette.h"
 
 class Equipment;
 class FloorItem;
@@ -269,9 +270,9 @@ class LocalPlayer : public Player
         void emote(Uint8 emotion);
 
         /**
-         * Shows item pickup effect if the player is on a map.
+         * Shows item pickup notifications.
          */
-        void pickedUp(const std::string &item);
+        void pickedUp(const ItemInfo &itemInfo, int amount);
 
         /**
          * Accessors for mInStorage
@@ -375,7 +376,8 @@ class LocalPlayer : public Player
 
         const std::auto_ptr<Equipment> mEquipment;
 
-        void addMessageToQueue(const std::string &message);
+        void addMessageToQueue(const std::string &message,
+                               Palette::ColorType color = Palette::EXP_INFO);
 
     protected:
         virtual void handleStatusEffect(StatusEffect *effect, int effectId);
@@ -443,7 +445,9 @@ class LocalPlayer : public Player
         /** Animated target cursors. */
         SimpleAnimation *mTargetCursor[2][NUM_TC];
 
-        std::list<std::string> mMessages; /**< Queued exp messages*/
+        typedef std::pair<std::string, Palette::ColorType> MessagePair;
+        /** Queued exp messages*/
+        std::list<MessagePair> mMessages;
         int mMessageTime;
 };
 
-- 
cgit v1.2.3-60-g2f50