split animation running from animation definition

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

diff --git a/src/graphics/ComplexAnimation.h b/src/graphics/ComplexAnimation.h
index a1ffaaabafd85923660829e7e55843497bf41124..2eeea943b6103740c3114f71b835b14c11953408 100644 (file)
--- a/src/graphics/ComplexAnimation.h
+++ b/src/graphics/ComplexAnimation.h
@@ -32,14 +32,11 @@ public:
                }
        }
 
-       virtual void Draw(SDL_Surface *dest, geometry::Point<int> position) const {
-               Animation::Draw(dest, position + frames[Frame()].disposition);
-       }
-
 protected:
-       virtual int Col() const { return frames[Frame()].col; }
-       virtual int Row() const { return frames[Frame()].row; }
        virtual int NumFrames() const { return frames.size(); };
+       virtual int Col(int frame) const { return frames[frame].col; }
+       virtual int Row(int frame) const { return frames[frame].row; }
+       virtual geometry::Vector<int> Offset(int frame) const { return frames[frame].disposition; }
 
 private:
        struct FrameProp {