From e313ed3cefea5c41865d4d3d45f6abf8f9564312 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 5 Dec 2014 20:58:33 +0100
Subject: [PATCH] Support animated container models

---
 apps/openmw/mwclass/container.cpp           |  7 +++++--
 apps/openmw/mwrender/activatoranimation.cpp | 13 ++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 179070aed..59e51e461 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -7,6 +7,7 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/mechanicsmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/failedaction.hpp"
@@ -21,7 +22,7 @@
 
 #include "../mwgui/tooltips.hpp"
 
-#include "../mwrender/objects.hpp"
+#include "../mwrender/actors.hpp"
 #include "../mwrender/renderinginterface.hpp"
 
 #include "../mwmechanics/npcstats.hpp"
@@ -87,7 +88,8 @@ namespace MWClass
     {
         const std::string model = getModel(ptr);
         if (!model.empty()) {
-            renderingInterface.getObjects().insertModel(ptr, model);
+            MWRender::Actors& actors = renderingInterface.getActors();
+            actors.insertActivator(ptr);
         }
     }
 
@@ -96,6 +98,7 @@ namespace MWClass
         const std::string model = getModel(ptr);
         if(!model.empty())
             physics.addObject(ptr);
+        MWBase::Environment::get().getMechanicsManager()->add(ptr);
     }
 
     std::string Container::getModel(const MWWorld::Ptr &ptr) const
diff --git a/apps/openmw/mwrender/activatoranimation.cpp b/apps/openmw/mwrender/activatoranimation.cpp
index de0457e57..540876a3e 100644
--- a/apps/openmw/mwrender/activatoranimation.cpp
+++ b/apps/openmw/mwrender/activatoranimation.cpp
@@ -4,6 +4,8 @@
 
 #include "../mwbase/world.hpp"
 
+#include "../mwworld/class.hpp"
+
 #include "renderconst.hpp"
 
 namespace MWRender
@@ -16,17 +18,14 @@ ActivatorAnimation::~ActivatorAnimation()
 ActivatorAnimation::ActivatorAnimation(const MWWorld::Ptr &ptr)
   : Animation(ptr, ptr.getRefData().getBaseNode())
 {
-    MWWorld::LiveCellRef<ESM::Activator> *ref = mPtr.get<ESM::Activator>();
+    const std::string& model = mPtr.getClass().getModel(mPtr);
 
-    assert(ref->mBase != NULL);
-    if(!ref->mBase->mModel.empty())
+    if(!model.empty())
     {
-        const std::string name = "meshes\\"+ref->mBase->mModel;
-
-        setObjectRoot(name, false);
+        setObjectRoot(model, false);
         setRenderProperties(mObjectRoot, RV_Misc, RQG_Main, RQG_Alpha);
 
-        addAnimSource(name);
+        addAnimSource(model);
     }
 }