Almost Done!

spine-cpp/spine-cpp/include/spine/EventTimeline.h

@@ -45,12 +45,14 @@ namespace Spine
     public:
         EventTimeline(int frameCount);
         
+        ~EventTimeline();
+        
         virtual void apply(Skeleton& skeleton, float lastTime, float time, Vector<Event*>* pEvents, float alpha, MixPose pose, MixDirection direction);
         
         virtual int getPropertyId();
         
         /// Sets the time and value of the specified keyframe.
-        void setFrame(int frameIndex, Event* e);
+        void setFrame(int frameIndex, Event* event);
         
         Vector<float> getFrames();
         void setFrames(Vector<float>& inValue);

spine-cpp/spine-cpp/src/spine/EventTimeline.cpp

@@ -38,6 +38,7 @@
 #include <spine/Slot.h>
 #include <spine/SlotData.h>
 #include <spine/Event.h>
+#include <spine/ContainerUtil.h>
 
 namespace Spine
 {
@@ -49,6 +50,11 @@ namespace Spine
         _events.reserve(frameCount);
     }
     
+    EventTimeline::~EventTimeline()
+    {
+        ContainerUtil::cleanUpVectorOfPointers(_events);
+    }
+    
     void EventTimeline::apply(Skeleton& skeleton, float lastTime, float time, Vector<Event*>* pEvents, float alpha, MixPose pose, MixDirection direction)
     {
         if (pEvents == NULL)
@@ -112,10 +118,10 @@ namespace Spine
         return ((int)TimelineType_Event << 24);
     }
     
-    void EventTimeline::setFrame(int frameIndex, Event* e)
+    void EventTimeline::setFrame(int frameIndex, Event* event)
     {
-        _frames[frameIndex] = e->getTime();
-        _events[frameIndex] = e;
+        _frames[frameIndex] = event->getTime();
+        _events[frameIndex] = event;
     }
     
     Vector<float> EventTimeline::getFrames() { return _frames; }