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

diff --git a/src/floor_item.h b/src/floor_item.h
index 36f81585..a87e3f79 100644
--- a/src/floor_item.h
+++ b/src/floor_item.h
@@ -25,6 +25,7 @@
 #define _TMW_FLOORITEM_H_
 
 #include "graphics.h"
+#include "item.h"
 #include "map.h"
 #include "sprite.h"
 #include "resources/image.h"
@@ -59,7 +60,7 @@ class FloorItem : public Sprite
          * Returns the item id.
          */
         unsigned int
-        getItemId() const { return mItemId; }
+        getItemId() const { return mItem->getId(); }
 
         /**
          * Returns the x coordinate.
@@ -89,16 +90,15 @@ class FloorItem : public Sprite
         void
         draw(Graphics *graphics, int offsetX, int offsetY) const
         {
-            graphics->drawImage(mImage,
+            graphics->drawImage(mItem->getImage(),
                                 mX * 32 + offsetX,
                                 mY * 32 + offsetY);
         }
 
     private:
         unsigned int mId;
-        unsigned int mItemId;
         unsigned short mX, mY;
-        Image *mImage;
+        Item *mItem;
         Sprites::iterator mSpriteIterator;
         Map *mMap;
 };