X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FComplexAnimation.h;h=eeeef680d37b558a8a06ebaa226c2b0d9d85ed4d;hb=2255d436a0c2acc10b015827366a72b2ece86094;hp=4e2cb32a0e9146bc19a5bf73149c0248f0d27b6c;hpb=1907ca03c5e865c4d398170042aa384c67ffff29;p=l2e.git diff --git a/src/graphics/ComplexAnimation.h b/src/graphics/ComplexAnimation.h index 4e2cb32..eeeef68 100644 --- a/src/graphics/ComplexAnimation.h +++ b/src/graphics/ComplexAnimation.h @@ -1,10 +1,3 @@ -/* - * ComplexAnimation.h - * - * Created on: Aug 12, 2012 - * Author: holy - */ - #ifndef GRAPHICS_COMPLEXANIMATION_H_ #define GRAPHICS_COMPLEXANIMATION_H_ @@ -19,9 +12,8 @@ public: static const int TYPE_ID = 402; public: - ComplexAnimation() : frames(0), numFrames(0) { } - ComplexAnimation(const Sprite *sprite, int frameTime, bool repeat = false) - : Animation(sprite, frameTime, repeat), frames(0), numFrames(0) { } + ComplexAnimation(); + ComplexAnimation(const Sprite *sprite, int frameTime, bool repeat = false); public: struct FrameProp { @@ -39,10 +31,10 @@ public: static void Construct(void *); protected: - virtual int NumFrames() const { return numFrames; }; - virtual int Col(int frame) const { return frames[frame].col; } - virtual int Row(int frame) const { return frames[frame].row; } - virtual geometry::Vector Offset(int frame) const { return frames[frame].disposition; } + virtual int NumFrames() const; + virtual int Col(int frame) const; + virtual int Row(int frame) const; + virtual geometry::Vector Offset(int frame) const; private: const FrameProp *frames;