From 9baedc27191c82bbf1fedee2a7e738bc5b267c0e Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Sun, 2 May 2010 14:43:40 -0600
Subject: 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
---
 src/flooritem.h | 42 +++++++++++++++---------------------------
 1 file changed, 15 insertions(+), 27 deletions(-)

(limited to 'src/flooritem.h')

diff --git a/src/flooritem.h b/src/flooritem.h
index 17b7b54d..e599c939 100644
--- a/src/flooritem.h
+++ b/src/flooritem.h
@@ -22,16 +22,14 @@
 #ifndef FLOORITEM_H
 #define FLOORITEM_H
 
-#include "map.h"
+#include "actorsprite.h"
 
-class Graphics;
-class Image;
-class Item;
+class ItemInfo;
 
 /**
  * An item lying on the floor.
  */
-class FloorItem : public Actor
+class FloorItem : public ActorSprite
 {
     public:
         /**
@@ -49,39 +47,29 @@ class FloorItem : public Actor
                   int y,
                   Map *map);
 
-        ~FloorItem();
-
-        /**
-         * Returns instance ID of this item.
-         */
-        int getId() const
-        { return mId; }
+        Type getType() const { return FLOOR_ITEM; }
 
         /**
          * Returns the item ID.
          */
-        int getItemId() const;
+        int getItemId() const
+        { return mItemId; }
 
         /**
-         * Returns the item object. Useful for adding an item link for the
-         * floor item to chat.
+         * Returns the item info for this floor item. Useful for adding an item
+         * link for the floor item to chat.
          */
-        Item *getItem() const;
+        const ItemInfo &getInfo() const;
 
-        /**
-         * Draws this floor item to the given graphics context.
-         *
-         * @see Actor::draw(Graphics, int, int)
-         */
-        void draw(Graphics *graphics, int offsetX, int offsetY) const;
+        virtual int getTileX() const
+        { return mX; }
 
-        /** We consider flooritems (at least for now) to be one layer-sprites */
-        virtual int getNumberOfLayers() const
-        { return 1; }
+        virtual int getTileY() const
+        { return mY; }
 
     private:
-        int mId;
-        Item *mItem;
+        int mItemId;
+        int mX, mY;
 };
 
 #endif
-- 
cgit v1.2.3-60-g2f50