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/animatedsprite.h | 47 ++++++-----------------------------------------
 1 file changed, 6 insertions(+), 41 deletions(-)

(limited to 'src/animatedsprite.h')

diff --git a/src/animatedsprite.h b/src/animatedsprite.h
index 54b63cc0..833a07a3 100644
--- a/src/animatedsprite.h
+++ b/src/animatedsprite.h
@@ -22,19 +22,18 @@
 #ifndef ANIMATEDSPRITE_H
 #define ANIMATEDSPRITE_H
 
-#include "resources/spritedef.h"
+#include "sprite.h"
 
 #include <map>
 #include <string>
 
 class Animation;
-class Graphics;
 struct Frame;
 
 /**
  * Animates a sprite by adding playback state.
  */
-class AnimatedSprite
+class AnimatedSprite : public Sprite
 {
     public:
         /**
@@ -53,59 +52,26 @@ class AnimatedSprite
         static AnimatedSprite *load(const std::string &filename,
                                     int variant = 0);
 
-        /**
-         * Destructor.
-         */
         virtual ~AnimatedSprite();
 
-        /**
-         * Resets the animated sprite.
-         */
         void reset();
 
-        /**
-         * Plays an action using the current direction
-         */
         void play(SpriteAction action);
 
-        /**
-         * Inform the animation of the passed time so that it can output the
-         * correct animation frame.
-         */
         void update(int time);
 
-        /**
-         * Draw the current animation frame at the coordinates given in screen
-         * pixels.
-         */
         bool draw(Graphics* graphics, int posX, int posY) const;
 
-        /**
-         * gets the width in pixels of the image of the current frame
-         */
         int getWidth() const;
 
-        /**
-         * gets the height in pixels of the image of the current frame
-         */
         int getHeight() const;
 
-        /**
-         * Sets the direction.
-         */
-        void setDirection(SpriteDirection direction);
+        Image* getImage() const;
 
-        /**
-         * Sets the alpha value of the animated sprite
-         */
-        void setAlpha(float alpha)
-        { mAlpha = alpha; }
+        void setDirection(SpriteDirection direction);
 
-        /**
-         * Returns the current alpha opacity of the animated sprite.
-         */
-        virtual float getAlpha() const
-        { return mAlpha; }
+        int getNumberOfLayers()
+        { return 1; }
 
     private:
         bool updateCurrentAnimation(unsigned int dt);
@@ -120,7 +86,6 @@ class AnimatedSprite
         Action *mAction;               /**< The currently active action. */
         Animation *mAnimation;         /**< The currently active animation. */
         Frame *mFrame;                 /**< The currently active frame. */
-        float mAlpha;                  /**< The alpha opacity used to draw */
 };
 
 #endif
-- 
cgit v1.2.3-70-g09d2