X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fanimation%2Fanimation.h;h=eb5911c32a4d08a6c441cabddbd56231aa05f56d;hb=f19366d32cc29287a2730cfba90893e407754081;hp=6845d23ee3e1652c9f7e49a86e5145f3faa6aa52;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git diff --git a/source/animation/animation.h b/source/animation/animation.h index 6845d23e..eb5911c3 100644 --- a/source/animation/animation.h +++ b/source/animation/animation.h @@ -31,10 +31,10 @@ public: int slopes_set; public: - Loader(Animation &); - Loader(Animation &, Collection &); + Loader(Animation &a): Loader(a, 0) { } + Loader(Animation &a, Collection &c): Loader(a, &c) { } private: - void init(); + Loader(Animation &, Collection *); virtual void finish(); void check_slopes_and_control(bool, bool); @@ -121,8 +121,9 @@ private: struct TimedKeyFrame { Time::TimeDelta time; - RefPtr keyframe; + const KeyFrame *keyframe; bool control; + bool owned; }; struct Event