1 files changed, 15 insertions, 43 deletions
diff --git a/src/flooritem.cpp b/src/flooritem.cpp
index c3442a86..c92619ff 100644
--- a/src/flooritem.cpp
+++ b/src/flooritem.cpp
@@ -21,59 +21,31 @@
 
 #include "flooritem.h"
 
-#include "graphics.h"
-#include "item.h"
-#include "map.h"
+#include "net/net.h"
+#include "net/playerhandler.h"
 
-#include "resources/image.h"
+#include "resources/itemdb.h"
+#include "resources/iteminfo.h"
 
 FloorItem::FloorItem(int id,
                      int itemId,
-                     int x,
-                     int y,
+                     const Vector &position,
                      Map *map):
-    mId(id),
-    mX(x),
-    mY(y),
-    mMap(map),
-    mAlpha(1.0f)
+    ActorSprite(id),
+    mItemId(itemId),
+    mX(0), mY(0)
 {
-    // Create a corresponding item instance
-    mItem = new Item(itemId);
+    mPos = position;
 
-    // Add ourselves to the map
-    mMapSprite = mMap->addSprite(this);
-}
-
-FloorItem::~FloorItem()
-{
-    // Remove ourselves from the map
-    mMap->removeSprite(mMapSprite);
-
-    delete mItem;
-}
+    setMap(map);
 
-int FloorItem::getItemId() const
-{
-    return mItem->getId();
-}
+    mX = (int)position.x / map->getTileWidth();
+    mY = (int)position.y / map->getTileHeight();
 
-Item *FloorItem::getItem() const
-{
-    return mItem;
+    setupSpriteDisplay(itemDb->get(itemId).getDisplay());
 }
 
-void FloorItem::draw(Graphics *graphics, int offsetX, int offsetY) const
+const ItemInfo &FloorItem::getInfo() const
 {
-    if (mItem)
-    {
-        Image *image = mItem->getDrawImage();
-
-        if (image)
-            if (mAlpha != image->getAlpha())
-                image->setAlpha(mAlpha);
-
-        graphics->drawImage(image, mX * mMap->getTileWidth() + offsetX,
-                            mY * mMap->getTileHeight() + offsetY);
-    }
+    return itemDb->get(mItemId);
 }