Created Copy constructor for TweenSets (for reuse). Prepare for component copy constructor.

RetroFE/Source/Graphics/Animate/TweenSets.cpp

@@ -19,6 +19,21 @@
 TweenSets::TweenSets()
 {
 }
+TweenSets::TweenSets(TweenSets &copy)
+{
+    std::map<std::string, std::map<int, TweenAttributes *> >::iterator it;
+
+    for(it = copy.TweenMap.begin(); it != copy.TweenMap.end(); it++)
+    {
+        std::map<int, TweenAttributes *>::iterator it2;
+
+        for(it2 = (it->second).begin(); it2 != (it->second).end(); it2++)
+        {
+            TweenMap[it->first][it2->first] = it2->second;
+        }
+    }
+
+}
 
 TweenSets::~TweenSets() 
 {

RetroFE/Source/Graphics/Animate/TweenSets.h

@@ -24,6 +24,7 @@ class TweenSets
 {
 public:
     TweenSets();
+    TweenSets(TweenSets &copy);
     ~TweenSets();
     typedef std::vector<std::vector<Tween *> *> TweenAttributes;
 

RetroFE/Source/Graphics/Component/Component.h

@@ -56,7 +56,6 @@ public:
     void SetScrollActive(bool scrollActive);
 
 protected:
-    std::string CollectionName;
     Item *GetSelectedItem();
     enum AnimationState
     {
@@ -84,20 +83,20 @@ protected:
     bool HighlightExitComplete;
     bool NewItemSelectedSinceEnter;
 private:
+
     bool Animate(bool loop);
     bool IsTweenSequencingComplete();
     void ResetTweenSequence(std::vector<ViewInfo *> *tweens);
+
     TweenSets *Tweens;
     TweenSets::TweenAttributes *CurrentTweens;
-    unsigned int CurrentTweenIndex;
-
-    bool CurrentTweenComplete;
-    ViewInfo BaseViewInfo;
-
-    float ElapsedTweenTime;
-    Tween *TweenInst;
     Item *SelectedItem;
-    bool ScrollActive;
     SDL_Texture *BackgroundTexture;
 
+    unsigned int CurrentTweenIndex;
+    bool CurrentTweenComplete;
+    std::string CollectionName;
+    ViewInfo BaseViewInfo;
+    float ElapsedTweenTime;
+    bool ScrollActive;
 };