alternate approach to battle animation

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

diff --git a/src/graphics/Animation.h b/src/graphics/Animation.h
index 0f33541f0397ce41ce479f4442246bf0b3fd8654..6af75d0a64639ae129a803b96f4c5249c4c7afea 100644 (file)
--- a/src/graphics/Animation.h
+++ b/src/graphics/Animation.h
@@ -39,15 +39,29 @@ public:
        void Stop() {
                timer = app::Timer<Uint32>();
        }
+       bool Started() const {
+               return timer.Started();
+       }
        bool Running() const {
                return timer.Running() && (repeat || timer.Iteration() < NumFrames());
        }
+       bool Finished() const {
+               return Started() && !Running();
+       }
+       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() + ColOffset(), Row() + RowOffset());
        }
@@ -64,8 +78,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;