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, 4 insertions, 6 deletions

diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 4df18b19..93b9ea37 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -61,22 +61,20 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
         graphics->drawRectangle(gcn::Rectangle(10 + 36 * (i % 4),
                 36 * (i / 4) + 25, 32, 32));
 
-        if (!(item = mEquipment->getEquipment(i))) {
+        if (!(item = mEquipment->getEquipment(i)))
             continue;
-        }
 
-        image = item->getInfo().getImage();
+        image = item->getImage();
         static_cast<Graphics*>(graphics)->drawImage(
                 image, 36 * (i % 4) + 10, 36 * (i / 4) + 25);
     }
 
     graphics->drawRectangle(gcn::Rectangle(160, 25, 32, 32));
 
-    if (!(item = mEquipment->getArrows())) {
+    if (!(item = mEquipment->getArrows()))
         return;
-    }
 
-    image = item->getInfo().getImage();
+    image = item->getImage();
 
     static_cast<Graphics*>(graphics)->drawImage(image, 160, 25);
     graphics->drawText(toString(item->getQuantity()), 170, 62,