Introduced SelectionListener to fix updating problem in inventory window

(should also be used to fix similar problem in trade, buy and sell dialogs).
Made the ItemInfo be passed around as a reference instead of a pointer, since
it is never NULL.

4 files changed, 48 insertions, 34 deletions

diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 5d39d832..b09d1cc0 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -23,22 +23,33 @@
 #include "iteminfo.h"
 
 #include "resourcemanager.h"
+#include "image.h"
 
-Image*
-ItemInfo::getImage() {
-    if (mImage == NULL && mImageName != "") {
-        mImage = ResourceManager::getInstance()->getImage(mImageName);
+
+ItemInfo::~ItemInfo()
+{
+    if (mImage != NULL)
+    {
+        mImage->decRef();
     }
-    return mImage;
 }
 
 void
-ItemInfo::setImage(const std::string &image) {
+ItemInfo::setImage(const std::string &image)
+{
     mImageName = "graphics/items/" + image;
-}
 
-ItemInfo::~ItemInfo() {
-    if (mImage != NULL){
-        mImage->decRef();
+    if (mImageName != "")
+    {
+        if (mImage != NULL)
+        {
+            mImage->decRef();
+        }
+
+        mImage = ResourceManager::getInstance()->getImage(mImageName);
+    }
+    else
+    {
+        mImage = NULL;
     }
 }
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index afa2e857..9a04bb2e 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -26,7 +26,7 @@
 
 #include <string>
 
-#include "image.h"
+class Image;
 
 /**
  * Defines a class for storing item infos.
@@ -40,8 +40,8 @@ class ItemInfo
          * Constructor.
          */
         ItemInfo():
-            mImage(NULL),
             mImageName(""),
+            mImage(NULL),
             mArt(0),
             mType(0),
             mWeight(0),
@@ -53,19 +53,19 @@ class ItemInfo
         setArt(short art) { mArt = art; }
 
         short
-        getArt() { return mArt; }
+        getArt() const { return mArt; }
 
         void
         setName(const std::string &name) { mName = name; }
 
-        std::string
-        getName() { return mName; }
+        const std::string&
+        getName() const { return mName; }
 
         void
         setImage(const std::string &image);
 
         Image*
-        getImage();
+        getImage() const { return mImage; }
 
         void
         setDescription(const std::string &description)
@@ -73,32 +73,32 @@ class ItemInfo
             mDescription = description;
         }
 
-        std::string
-        getDescription() { return mDescription; }
+        const std::string&
+        getDescription() const { return mDescription; }
 
         void
         setEffect(const std::string &effect) { mEffect = effect; }
 
-        std::string
-        getEffect() { return mEffect; }
+        const std::string&
+        getEffect() const { return mEffect; }
 
         void
         setType(short type) { mType = type; }
 
         short
-        getType() { return mType; }
+        getType() const { return mType; }
 
         void
         setWeight(short weight) { mWeight = weight; }
 
         short
-        getWeight() { return mWeight; }
+        getWeight() const { return mWeight; }
 
         void
         setSlot(char slot) { mSlot = slot; }
 
         char
-        getSlot() { return mSlot; }
+        getSlot() const { return mSlot; }
 
     protected:
         /**
@@ -106,8 +106,14 @@ class ItemInfo
          */
         ~ItemInfo();
 
-        Image* mImage;
         std::string mImageName;
+
+        /* TODO (BL): I do not think the item info should keep a reference to
+         * the item icon. It would probably be better if this was kept in the
+         * Item class, so that the images can be lazily instantiated and also
+         * unloaded when no longer used.
+         */
+        Image *mImage;
         short mArt;
         std::string mName;
         std::string mDescription;
diff --git a/src/resources/itemmanager.cpp b/src/resources/itemmanager.cpp
index a497b3c8..7d0b13f2 100644
--- a/src/resources/itemmanager.cpp
+++ b/src/resources/itemmanager.cpp
@@ -41,8 +41,7 @@
 
 ItemManager::ItemManager()
 {
-    mUnknown = new ItemInfo();
-    mUnknown->setName("Unknown item");
+    mUnknown.setName("Unknown item");
 
     ResourceManager *resman = ResourceManager::getInstance();
     int size;
@@ -163,14 +162,12 @@ ItemManager::~ItemManager()
         delete i->second;
     }
     mItemInfos.clear();
-
-    delete mUnknown;
 }
 
-ItemInfo*
+const ItemInfo&
 ItemManager::getItemInfo(int id)
 {
     ItemInfoIterator i = mItemInfos.find(id);
 
-    return (i != mItemInfos.end()) ? i->second : mUnknown;
+    return (i != mItemInfos.end()) ? *(i->second) : mUnknown;
 }
diff --git a/src/resources/itemmanager.h b/src/resources/itemmanager.h
index 06eee507..b1f2b95c 100644
--- a/src/resources/itemmanager.h
+++ b/src/resources/itemmanager.h
@@ -24,9 +24,9 @@
 #ifndef _TMW_ITEM_MANAGER_H
 #define _TMW_ITEM_MANAGER_H
 
-#include <map>
+#include "iteminfo.h"
 
-class ItemInfo;
+#include <map>
 
 /**
  * Defines a class to load items database.
@@ -44,14 +44,14 @@ class ItemManager
          */
         ~ItemManager();
 
-        ItemInfo *getItemInfo(int id);
+        const ItemInfo& getItemInfo(int id);
 
     protected:
         // Items database
         typedef std::map<int, ItemInfo*> ItemInfos;
         typedef ItemInfos::iterator ItemInfoIterator;
         ItemInfos mItemInfos;
-        ItemInfo *mUnknown;
+        ItemInfo mUnknown;
 };
 
 extern ItemManager *itemDb;