From 77efbb50066a030d1f44f8de8d06ace9f284e3a2 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 3 Sep 2006 15:00:47 +0000
Subject: 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.

---
 src/resources/iteminfo.cpp | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

(limited to 'src/resources/iteminfo.cpp')

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;
     }
 }
-- 
cgit v1.2.3-70-g09d2