Merged revisions 3738 via svnmerge from

https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk

........
  r3738 | b_lindeijer | 2007-11-16 00:44:01 +0100 (Fri, 16 Nov 2007) | 3 lines
  
  Moved item icon from ItemInfo class to the Item class, so that it can be loaded
  on demand. Results in faster startup time and reduced memory usage.
........

1 files changed, 5 insertions, 6 deletions

diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index eb8b91a7..cf5dcb92 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -101,9 +101,8 @@ ItemContainer::draw(gcn::Graphics *graphics)
     {
         Item *item = mInventory->getItem(i);
 
-        if (item->getQuantity() <= 0) {
+        if (!item || item->getQuantity() <= 0)
             continue;
-        }
 
         int itemX = ((i - 2) % columns) * gridWidth;
         int itemY = ((i - 2) / columns) * gridHeight;
@@ -116,8 +115,8 @@ ItemContainer::draw(gcn::Graphics *graphics)
         }
 
         // Draw item icon
-        Image* image;
-        if ((image = item->getInfo().getImage()) != NULL)
+        Image* image = item->getImage();
+        if (image)
         {
             static_cast<Graphics*>(graphics)->drawImage(
                     image, itemX, itemY);
@@ -151,7 +150,7 @@ void ItemContainer::recalculateHeight()
 }
 
 Item*
-ItemContainer::getItem()
+ItemContainer::getSelectedItem() const
 {
     return mSelectedItem;
 }
@@ -206,7 +205,7 @@ ItemContainer::mousePressed(gcn::MouseEvent &event)
         }
         Item *item = mInventory->getItem(index);
         setSelectedItem(item);
-        if (!item->isEquipment())
+        if (item && !item->isEquipment())
         {
             itemShortcut->setItemSelected(item->getId());
         }