From 6d6ed909bf62a328c927fbbdb52b6a98ef677e28 Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Tue, 27 Mar 2012 00:31:15 +0200
Subject: [PATCH] Issue #225: Deallocate memory used by actors animations.

---
 apps/openmw/mwrender/actors.cpp | 10 ++++++++++
 apps/openmw/mwrender/actors.hpp |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/actors.cpp b/apps/openmw/mwrender/actors.cpp
index d8ca78e3a..6eb4a182b 100644
--- a/apps/openmw/mwrender/actors.cpp
+++ b/apps/openmw/mwrender/actors.cpp
@@ -8,6 +8,15 @@ using namespace Ogre;
 using namespace MWRender;
 using namespace NifOgre;
 
+Actors::~Actors(){
+
+    std::map<MWWorld::Ptr, Animation*>::iterator it = mAllActors.begin();
+    for (; it != mAllActors.end(); ++it) {
+        delete it->second;
+        it->second = NULL;
+    }
+}
+
 void Actors::setMwRoot(Ogre::SceneNode* root){
     mMwRoot = root;
 }
@@ -61,6 +70,7 @@ void Actors::insertCreature (const MWWorld::Ptr& ptr){
     insertBegin(ptr, true, true);
    CreatureAnimation* anim = new MWRender::CreatureAnimation(ptr, mEnvironment, mRend);
     //mAllActors.insert(std::pair<MWWorld::Ptr, Animation*>(ptr,anim));
+    delete mAllActors[ptr];
     mAllActors[ptr] = anim;
    //mAllActors.push_back(&anim);*/
 }
diff --git a/apps/openmw/mwrender/actors.hpp b/apps/openmw/mwrender/actors.hpp
index 7179c08fb..d49c6e0f8 100644
--- a/apps/openmw/mwrender/actors.hpp
+++ b/apps/openmw/mwrender/actors.hpp
@@ -30,7 +30,7 @@ namespace MWRender{
 
         public:
         Actors(OEngine::Render::OgreRenderer& _rend, MWWorld::Environment& _env): mRend(_rend), mEnvironment(_env){}
-        ~Actors(){}
+        ~Actors();
         void setMwRoot(Ogre::SceneNode* root);
         void insertBegin (const MWWorld::Ptr& ptr, bool enabled, bool static_);
         void insertCreature (const MWWorld::Ptr& ptr);