the item icons are now stored in different files with more descriptive names

4 files changed, 11 insertions, 24 deletions

diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index bef39dff..2cbffde4 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -40,15 +40,10 @@ EquipmentWindow::EquipmentWindow(Equipment *equipment):
     setWindowName("Equipment");
     setDefaultSize(5, 230, 200, 120);
     loadWindowState();
-
-    mItemset = ResourceManager::getInstance()->getSpriteset(
-            "graphics/sprites/items.png", 32, 32);
-    if (!mItemset) logger->error("Unable to load items.png");
 }
 
 EquipmentWindow::~EquipmentWindow()
 {
-    mItemset->decRef();
 }
 
 void EquipmentWindow::draw(gcn::Graphics *graphics)
@@ -70,7 +65,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
             continue;
         }
 
-        image = mItemset->get(item->getInfo()->getImage() - 1);
+        image = item->getInfo()->getImage();
         dynamic_cast<Graphics*>(graphics)->drawImage(
                 image, 36 * (i % 4) + 10, 36 * (i / 4) + 25);
     }
@@ -81,7 +76,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
         return;
     }
 
-    image = mItemset->get(item->getInfo()->getImage() - 1);
+    image = item->getInfo()->getImage();
 
     dynamic_cast<Graphics*>(graphics)->drawImage(image, 160, 25);
     graphics->drawText(toString(item->getQuantity()), 170, 62,
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index aeaae58c..99a3cc60 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -27,7 +27,6 @@
 #include "window.h"
 
 class Equipment;
-class Spriteset;
 
 /**
  * Equipment dialog.
@@ -53,8 +52,6 @@ class EquipmentWindow : public Window
         void draw(gcn::Graphics *graphics);
 
     private:
-        Spriteset *mItemset;
-
         Equipment *mEquipment;
 };
 
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index edcf9764..c7c55fd9 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -41,8 +41,6 @@ ItemContainer::ItemContainer(Inventory *inventory):
     mInventory(inventory)
 {
     ResourceManager *resman = ResourceManager::getInstance();
-    mItemset = resman->getSpriteset("graphics/sprites/items.png", 32, 32);
-    if (!mItemset) logger->error("Unable to load items.png");
 
     mSelImg = resman->getImage("graphics/gui/selection.png");
     if (!mSelImg) logger->error("Unable to load selection.png");
@@ -55,7 +53,6 @@ ItemContainer::ItemContainer(Inventory *inventory):
 
 ItemContainer::~ItemContainer()
 {
-    mItemset->decRef();
     mSelImg->decRef();
 }
 
@@ -73,8 +70,8 @@ void ItemContainer::logic()
 
 void ItemContainer::draw(gcn::Graphics* graphics)
 {
-    int gridWidth = mItemset->get(0)->getWidth() + 4;
-    int gridHeight = mItemset->get(0)->getHeight() + 10;
+    int gridWidth = 36; //(item icon width + 4)
+    int gridHeight = 42; //(item icon height + 10)
     int columns = getWidth() / gridWidth;
 
     // Have at least 1 column
@@ -113,11 +110,11 @@ void ItemContainer::draw(gcn::Graphics* graphics)
         }
 
         // Draw item icon
-        int idx;
-        if ((idx = item->getInfo()->getImage()) > 0)
+        Image* image;
+        if ((image = item->getInfo()->getImage()) != NULL)
         {
             dynamic_cast<Graphics*>(graphics)->drawImage(
-                    mItemset->get(idx - 1), itemX, itemY);
+                    image, itemX, itemY);
         }
 
         // Draw item caption
@@ -133,8 +130,8 @@ void ItemContainer::setWidth(int width)
 {
     gcn::Widget::setWidth(width);
 
-    int gridWidth = mItemset->get(0)->getWidth() + 4;
-    int gridHeight = mItemset->get(0)->getHeight() + 14;
+    int gridWidth = 36; //item icon width + 4
+    int gridHeight = 46; //item icon height + 14
     int columns = getWidth() / gridWidth;
 
     if (columns < 1)
@@ -158,8 +155,8 @@ void ItemContainer::selectNone()
 
 void ItemContainer::mousePress(int mx, int my, int button)
 {
-    int gridWidth = mItemset->get(0)->getWidth() + 4;
-    int gridHeight = mItemset->get(0)->getHeight() + 10;
+    int gridWidth = 36; //(item icon width + 4)
+    int gridHeight = 42; //(item icon height + 10)
     int columns = getWidth() / gridWidth;
 
     if (button == gcn::MouseInput::LEFT || gcn::MouseInput::RIGHT)
diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h
index 63e8bf47..f52f37ec 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.h
@@ -30,7 +30,6 @@
 class Image;
 class Inventory;
 class Item;
-class Spriteset;
 
 /**
  * An item container. Used to show items in inventory and trade dialog.
@@ -83,7 +82,6 @@ class ItemContainer : public gcn::Widget, public gcn::MouseListener
 
     private:
         Inventory *mInventory;
-        Spriteset *mItemset;
         Image *mSelImg;
         Item *mSelectedItem;