added number animation

[l2e.git] / src / graphics / Animation.h

diff --git a/src/graphics/Animation.h b/src/graphics/Animation.h
index 55a16d99034fb70a30323ed6506514c67cebdfe0..0c6ae288b4a5e04220f764d9c5ba6b4ee05597c4 100644 (file)
--- a/src/graphics/Animation.h
+++ b/src/graphics/Animation.h
@@ -24,9 +24,9 @@ class Animation {
 
 public:
        Animation()
-       : sprite(0), frameTime(0), repeat(false) { }
+       : sprite(0), frameTime(0), colOffset(0), rowOffset(0), repeat(false) { }
        Animation(const Sprite *sprite, int frameTime, bool repeat = false)
-       : sprite(sprite), frameTime(frameTime), repeat(repeat) { }
+       : sprite(sprite), frameTime(frameTime), colOffset(0), rowOffset(0), repeat(repeat) { }
        virtual ~Animation() { };
 
 public:
@@ -42,8 +42,22 @@ public:
        bool Running() const {
                return timer.Running() && (repeat || timer.Iteration() < NumFrames());
        }
+       bool JustFinished() const {
+               return timer.JustHit() && timer.Iteration() == NumFrames();
+       }
+
+       const app::Timer<Uint32> &GetTimer() { return timer; }
+
+       void SetColOffset(int offset) { colOffset = offset; }
+       int ColOffset() const { return colOffset; }
+       void SetRowOffset(int offset) { rowOffset = offset; }
+       int RowOffset() const { return rowOffset; }
+
+       const Sprite *GetSprite() const { return sprite; }
+       void ChangeSprite(const Sprite *s) { sprite = s; }
+
        virtual void Draw(SDL_Surface *dest, geometry::Point<int> position) const {
-               sprite->Draw(dest, position, Col(), Row());
+               sprite->Draw(dest, position, Col() + ColOffset(), Row() + RowOffset());
        }
        void DrawTopRight(SDL_Surface *dest, geometry::Point<int> position) const {
                geometry::Vector<int> offset(-sprite->Width(), 0);
@@ -58,8 +72,9 @@ public:
                Draw(dest, position + offset);
        }
 
-protected:
        int Frame() const { return Running() ? (timer.Iteration() % NumFrames()) : 0; }
+
+protected:
        virtual int Col() const = 0;
        virtual int Row() const = 0;
        virtual int NumFrames() const = 0;
@@ -68,6 +83,8 @@ private:
        const Sprite *sprite;
        app::Timer<Uint32> timer;
        int frameTime;
+       int colOffset;
+       int rowOffset;
        bool repeat;
 
 };