Add support for floor item sprites

This commit adds a sprite hierarchy (Sprite->ImageSprite,AnimatedSprite,CompundSprite;
CompoundSprite,Actor->ActorSprite;ActorSprite->Being,FloorItem) to collect common
functionailty into new base classes which will make other Mantis tickets easier to do.
Also allows monsters to use particle effects.

Reviewed-by: Bertram

1 files changed, 16 insertions, 34 deletions

diff --git a/src/flooritem.cpp b/src/flooritem.cpp
index e5a9d215..84e07f35 100644
--- a/src/flooritem.cpp
+++ b/src/flooritem.cpp
@@ -21,52 +21,34 @@
 
 #include "flooritem.h"
 
-#include "graphics.h"
-#include "item.h"
-#include "map.h"
+#include "net/net.h"
 
-#include "resources/image.h"
+#include "resources/itemdb.h"
+#include "resources/iteminfo.h"
 
 FloorItem::FloorItem(int id,
                      int itemId,
                      int x,
                      int y,
                      Map *map):
-    mId(id)
+    ActorSprite(id),
+    mItemId(itemId),
+    mX(x),
+    mY(y)
 {
     setMap(map);
-    mPos.x = x * map->getTileWidth();
-    mPos.y = y * map->getTileHeight();
-    // Create a corresponding item instance
-    mItem = new Item(itemId);
-}
 
-FloorItem::~FloorItem()
-{
-    delete mItem;
-}
+    // TODO: Eventually, we probably should fix all sprite offsets so that
+    //       these translations aren't necessary anymore. The sprites know
+    //       best where their base point should be.
+    mPos.x = x * map->getTileWidth() + 16;
+    mPos.y = y * map->getTileHeight() +
+             ((Net::getNetworkType() == ServerInfo::MANASERV) ? 15 : 32);
 
-int FloorItem::getItemId() const
-{
-    return mItem->getId();
+    setupSpriteDisplay(ItemDB::get(itemId).getDisplay());
 }
 
-Item *FloorItem::getItem() const
+const ItemInfo &FloorItem::getInfo() const
 {
-    return mItem;
-}
-
-void FloorItem::draw(Graphics *graphics, int offsetX, int offsetY) const
-{
-    if (mItem)
-    {
-        Image *image = mItem->getDrawImage();
-
-        if (image)
-            if (mAlpha != image->getAlpha())
-                image->setAlpha(mAlpha);
-
-        graphics->drawImage(image, getPixelX() + offsetX,
-                            getPixelY() + offsetY);
-    }
+    return ItemDB::get(mId);
 }