Use constructor delegation instead of init functions when possible

[libs/gl.git] / source / animation / animation.h

diff --git a/source/animation/animation.h b/source/animation/animation.h
index 6845d23ee3e1652c9f7e49a86e5145f3faa6aa52..eb5911c32a4d08a6c441cabddbd56231aa05f56d 100644 (file)
--- 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<const KeyFrame> keyframe;
+               const KeyFrame *keyframe;
                bool control;
+               bool owned;
        };
 
        struct Event