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

diff --git a/src/floor_item.cpp b/src/floor_item.cpp
index 5d83e1dd..9727093f 100644
--- a/src/floor_item.cpp
+++ b/src/floor_item.cpp
@@ -25,23 +25,18 @@
 
 #include "map.h"
 
-#include "resources/itemdb.h"
-#include "resources/iteminfo.h"
-
-
 FloorItem::FloorItem(unsigned int id,
                      unsigned int itemId,
                      unsigned short x,
                      unsigned short y,
                      Map *map):
     mId(id),
-    mItemId(itemId),
     mX(x),
     mY(y),
     mMap(map)
 {
-    // Retrieve item image from item info
-    mImage = ItemDB::get(itemId).getImage();
+    // Create a corresponding item instance
+    mItem = new Item(itemId);
 
     // Add ourselves to the map
     mSpriteIterator = mMap->addSprite(this);
@@ -51,4 +46,6 @@ FloorItem::~FloorItem()
 {
     // Remove ourselves from the map
     mMap->removeSprite(mSpriteIterator);
+
+    delete mItem;
 }