Use vector when there's no reason to use some other container

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

diff --git a/source/animationplayer.h b/source/animationplayer.h
index f4eb0c767c8c660296e35c204588c40f6d7da42e..93482c74f9b88daac2744e343f2bc04ab6bbdb42 100644 (file)
--- a/source/animationplayer.h
+++ b/source/animationplayer.h
@@ -19,20 +19,18 @@ class AnimationPlayer
 private:
        struct AnimationSlot
        {
 private:
        struct AnimationSlot
        {

-               const Animation &animation;
+               const Animation *animation;

                Animation::Iterator iterator;
 
                AnimationSlot(const Animation &);
        };
 
                Animation::Iterator iterator;
 
                AnimationSlot(const Animation &);
        };
 

-       typedef std::list<AnimationSlot> AnimationList;
-

        struct ObjectSlot
        {
                AnimatedObject &object;
                Matrix base_matrix;
                const Armature *armature;
        struct ObjectSlot
        {
                AnimatedObject &object;
                Matrix base_matrix;
                const Armature *armature;

-               AnimationList animations;
+               std::vector<AnimationSlot> animations;

                bool stacked;
 
                ObjectSlot(AnimatedObject &);
                bool stacked;
 
                ObjectSlot(AnimatedObject &);