From de2eeb4cde6c5e1e49202f07c6b3460228393781 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 14 Aug 2010 09:20:47 +0200
Subject: [PATCH 1/5] integrated insertObject function into class hierarchy

---
 apps/openmw/mwrender/cellimp.cpp  | 63 ++++++++++++++++++-------------
 apps/openmw/mwrender/cellimp.hpp  | 12 +++---
 apps/openmw/mwrender/interior.cpp |  9 +----
 apps/openmw/mwrender/interior.hpp | 13 +++++--
 apps/openmw/mwworld/class.cpp     |  6 +++
 apps/openmw/mwworld/class.hpp     | 10 +++++
 apps/openmw/mwworld/world.cpp     |  3 +-
 7 files changed, 71 insertions(+), 45 deletions(-)

diff --git a/apps/openmw/mwrender/cellimp.cpp b/apps/openmw/mwrender/cellimp.cpp
index 121f17383..1f1034379 100644
--- a/apps/openmw/mwrender/cellimp.cpp
+++ b/apps/openmw/mwrender/cellimp.cpp
@@ -2,6 +2,9 @@
 
 #include <cassert>
 
+#include "../mwworld/class.hpp"
+#include "../mwworld/ptr.hpp"
+
 using namespace MWRender;
 
 template<typename T>
@@ -59,37 +62,45 @@ void insertObj(CellRenderImp& cellRender, ESMS::LiveCellRef<ESM::NPC, MWWorld::R
 }
 
 template<typename T>
-void insertCellRefList (CellRenderImp& cellRender, const ESMS::ESMStore& store, T& cellRefList)
+void insertCellRefList (CellRenderImp& cellRender, MWWorld::Environment& environment,
+    T& cellRefList, ESMS::CellStore<MWWorld::RefData> &cell)
 {
-    for(typename T::List::iterator it = cellRefList.list.begin();
-        it != cellRefList.list.end(); it++)
+    if (!cellRefList.list.empty())
     {
-        if (it->mData.getCount())
-            insertObj (cellRender, *it, store);
+        const MWWorld::Class& class_ =
+            MWWorld::Class::get (MWWorld::Ptr (&*cellRefList.list.begin(), &cell));
+
+        for (typename T::List::iterator it = cellRefList.list.begin();
+            it != cellRefList.list.end(); it++)
+        {
+            if (it->mData.getCount())
+                class_.insertObj (MWWorld::Ptr (&*it, &cell), cellRender, environment);
+        }
     }
 }
 
-void CellRenderImp::insertCell(ESMS::CellStore<MWWorld::RefData> &cell, const ESMS::ESMStore& store)
+void CellRenderImp::insertCell(ESMS::CellStore<MWWorld::RefData> &cell,
+    MWWorld::Environment& environment)
 {
   // Loop through all references in the cell
-  insertCellRefList (*this, store, cell.activators);
-  insertCellRefList (*this, store, cell.potions);
-  insertCellRefList (*this, store, cell.appas);
-  insertCellRefList (*this, store, cell.armors);
-  insertCellRefList (*this, store, cell.books);
-  insertCellRefList (*this, store, cell.clothes);
-  insertCellRefList (*this, store, cell.containers);
-  insertCellRefList (*this, store, cell.creatures);
-  insertCellRefList (*this, store, cell.doors);
-  insertCellRefList (*this, store, cell.ingreds);
-  //  insertCellRefList (*this, store, cell.creatureLists);
-  //  insertCellRefList (*this, store, cell.itemLists);
-  insertCellRefList (*this, store, cell.lights);
-  insertCellRefList (*this, store, cell.lockpicks);
-  insertCellRefList (*this, store, cell.miscItems);
-  insertCellRefList (*this, store, cell.npcs);
-  insertCellRefList (*this, store, cell.probes);
-  insertCellRefList (*this, store, cell.repairs);
-  insertCellRefList (*this, store, cell.statics);
-  insertCellRefList (*this, store, cell.weapons);
+  insertCellRefList (*this, environment, cell.activators, cell);
+  insertCellRefList (*this, environment, cell.potions, cell);
+  insertCellRefList (*this, environment, cell.appas, cell);
+  insertCellRefList (*this, environment, cell.armors, cell);
+  insertCellRefList (*this, environment, cell.books, cell);
+  insertCellRefList (*this, environment, cell.clothes, cell);
+  insertCellRefList (*this, environment, cell.containers, cell);
+  insertCellRefList (*this, environment, cell.creatures, cell);
+  insertCellRefList (*this, environment, cell.doors, cell);
+  insertCellRefList (*this, environment, cell.ingreds, cell);
+  //  insertCellRefList (*this, environment, cell.creatureLists, cell);
+  //  insertCellRefList (*this, environment, cell.itemLists, cell);
+  insertCellRefList (*this, environment, cell.lights, cell);
+  insertCellRefList (*this, environment, cell.lockpicks, cell);
+  insertCellRefList (*this, environment, cell.miscItems, cell);
+  insertCellRefList (*this, environment, cell.npcs, cell);
+  insertCellRefList (*this, environment, cell.probes, cell);
+  insertCellRefList (*this, environment, cell.repairs, cell);
+  insertCellRefList (*this, environment, cell.statics, cell);
+  insertCellRefList (*this, environment, cell.weapons, cell);
 }
diff --git a/apps/openmw/mwrender/cellimp.hpp b/apps/openmw/mwrender/cellimp.hpp
index a4bb6868c..fadba79a5 100644
--- a/apps/openmw/mwrender/cellimp.hpp
+++ b/apps/openmw/mwrender/cellimp.hpp
@@ -12,9 +12,9 @@ namespace ESM
   class CellRef;
 }
 
-namespace ESMS
+namespace MWWorld
 {
-  class ESMStore;
+    class Environment;
 }
 
 namespace MWRender
@@ -33,14 +33,14 @@ namespace MWRender
 
     /// insert a mesh related to the most recent insertBegin call.
     virtual void insertMesh(const std::string &mesh) = 0;
-    
+
     /// insert a light related to the most recent insertBegin call.
     virtual void insertLight(float r, float g, float b, float radius) = 0;
-    
+
     /// finish inserting a new reference and return a handle to it.
     virtual std::string insertEnd (bool Enable) = 0;
-      
-    void insertCell(ESMS::CellStore<MWWorld::RefData> &cell, const ESMS::ESMStore& store);
+
+    void insertCell(ESMS::CellStore<MWWorld::RefData> &cell, MWWorld::Environment& environment);
 
   };
 }
diff --git a/apps/openmw/mwrender/interior.cpp b/apps/openmw/mwrender/interior.cpp
index d559a1216..1e88ecab4 100644
--- a/apps/openmw/mwrender/interior.cpp
+++ b/apps/openmw/mwrender/interior.cpp
@@ -174,19 +174,12 @@ void InteriorCellRender::setAmbientMode()
 
 void InteriorCellRender::show()
 {
-  // If already loaded, just make the cell visible.
-  if(base)
-    {
-      base->setVisible(true);
-      return;
-    }
-
   base = scene.getRoot()->createChildSceneNode();
 
   configureAmbient();
   configureFog();
 
-  insertCell(cell, store);
+  insertCell(cell, mEnvironment);
 }
 
 void InteriorCellRender::hide()
diff --git a/apps/openmw/mwrender/interior.hpp b/apps/openmw/mwrender/interior.hpp
index 3d375f7f2..8d69ca061 100644
--- a/apps/openmw/mwrender/interior.hpp
+++ b/apps/openmw/mwrender/interior.hpp
@@ -3,7 +3,6 @@
 
 #include "cell.hpp"
 #include "cellimp.hpp"
-#include "components/esm_store/cell_store.hpp"
 
 #include "OgreColourValue.h"
 
@@ -12,6 +11,11 @@ namespace Ogre
   class SceneNode;
 }
 
+namespace MWWorld
+{
+    class Environment;
+}
+
 namespace MWRender
 {
   class MWScene;
@@ -43,7 +47,7 @@ namespace MWRender
     static bool lightOutQuadInLin;
 
     ESMS::CellStore<MWWorld::RefData> &cell;
-    const ESMS::ESMStore &store;
+    MWWorld::Environment &mEnvironment;
     MWScene &scene;
 
     /// The scene node that contains all objects belonging to this
@@ -79,8 +83,9 @@ namespace MWRender
 
   public:
 
-    InteriorCellRender(ESMS::CellStore<MWWorld::RefData> &_cell, const ESMS::ESMStore& _store, MWScene &_scene)
-    : cell(_cell), store(_store), scene(_scene), base(NULL), insert(NULL), ambientMode (0) {}
+    InteriorCellRender(ESMS::CellStore<MWWorld::RefData> &_cell, MWWorld::Environment& environment,
+        MWScene &_scene)
+    : cell(_cell), mEnvironment (environment), scene(_scene), base(NULL), insert(NULL), ambientMode (0) {}
 
     virtual ~InteriorCellRender() { destroy(); }
 
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 85e5140ea..b7498dcdd 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -14,6 +14,12 @@ namespace MWWorld
 
     Class::~Class() {}
 
+    void Class::insertObj (const Ptr& ptr, MWRender::CellRenderImp& cellRender,
+        MWWorld::Environment& environment) const
+    {
+
+    }
+
     MWMechanics::CreatureStats& Class::getCreatureStats (const Ptr& ptr) const
     {
         throw std::runtime_error ("class does not have creature stats");
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 28d96d69f..83269957a 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -10,6 +10,11 @@
 #include "containerstore.hpp"
 #include "refdata.hpp"
 
+namespace MWRender
+{
+    class CellRenderImp;
+}
+
 namespace MWMechanics
 {
     struct CreatureStats;
@@ -18,6 +23,7 @@ namespace MWMechanics
 namespace MWWorld
 {
     class Ptr;
+    class Environment;
 
     /// \brief Base class for referenceable esm records
     class Class
@@ -36,6 +42,10 @@ namespace MWWorld
 
             virtual ~Class();
 
+            virtual void insertObj (const Ptr& ptr, MWRender::CellRenderImp& cellRender,
+                MWWorld::Environment& environment) const;
+            ///< Add reference into a cell for rendering (default implementation: don't render anything).
+
             virtual std::string getName (const Ptr& ptr) const = 0;
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
diff --git a/apps/openmw/mwworld/world.cpp b/apps/openmw/mwworld/world.cpp
index c8230f5a8..823cb2528 100644
--- a/apps/openmw/mwworld/world.cpp
+++ b/apps/openmw/mwworld/world.cpp
@@ -537,6 +537,7 @@ namespace MWWorld
             active->second->destroy();
             delete active->second;
             mActiveCells.erase (active);
+            // TODO remove sounds
         }
 
         // register local scripts
@@ -551,7 +552,7 @@ namespace MWWorld
         // This connects the cell data with the rendering scene.
         std::pair<CellRenderCollection::iterator, bool> result =
             mActiveCells.insert (std::make_pair (cell,
-            new MWRender::InteriorCellRender (*cell, mStore, mScene)));
+            new MWRender::InteriorCellRender (*cell, mEnvironment, mScene)));
 
         if (result.second)
         {

From 4649d7fa4174958f5907d61520d490b0c3428f21 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 14 Aug 2010 09:29:38 +0200
Subject: [PATCH 2/5] stop sounds on cell change

---
 apps/openmw/mwsound/soundmanager.cpp | 2 +-
 apps/openmw/mwworld/world.cpp        | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwsound/soundmanager.cpp b/apps/openmw/mwsound/soundmanager.cpp
index b6f88daa1..20b365b37 100644
--- a/apps/openmw/mwsound/soundmanager.cpp
+++ b/apps/openmw/mwsound/soundmanager.cpp
@@ -120,7 +120,7 @@ namespace MWSound
     {
     }
 
-    void stopSound (MWWorld::Ptr::CellStore *cell)
+    void SoundManager::stopSound (MWWorld::Ptr::CellStore *cell)
     {
         // Note to Nico: You can get the cell of a Ptr via the getCell function. Just iterate over all
         // sounds and remove those with matching cell.
diff --git a/apps/openmw/mwworld/world.cpp b/apps/openmw/mwworld/world.cpp
index 823cb2528..620751f61 100644
--- a/apps/openmw/mwworld/world.cpp
+++ b/apps/openmw/mwworld/world.cpp
@@ -11,6 +11,8 @@
 
 #include "../mwmechanics/mechanicsmanager.hpp"
 
+#include "../mwsound/soundmanager.hpp"
+
 #include "ptr.hpp"
 #include "environment.hpp"
 
@@ -535,9 +537,9 @@ namespace MWWorld
         {
             mEnvironment.mMechanicsManager->dropActors (active->first);
             active->second->destroy();
+            mEnvironment.mSoundManager->stopSound (active->first);
             delete active->second;
             mActiveCells.erase (active);
-            // TODO remove sounds
         }
 
         // register local scripts

From 967f85875d772fb215d27e121f4bb73979cef9bb Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 14 Aug 2010 10:02:54 +0200
Subject: [PATCH 3/5] reimplemented class-dependend rendering code in MWClass

---
 apps/openmw/mwclass/activator.cpp  | 18 ++++++++++
 apps/openmw/mwclass/activator.hpp  |  4 +++
 apps/openmw/mwclass/apparatus.cpp  | 18 ++++++++++
 apps/openmw/mwclass/apparatus.hpp  |  4 +++
 apps/openmw/mwclass/armor.cpp      | 18 ++++++++++
 apps/openmw/mwclass/armor.hpp      |  4 +++
 apps/openmw/mwclass/book.cpp       | 18 ++++++++++
 apps/openmw/mwclass/book.hpp       |  4 +++
 apps/openmw/mwclass/clothing.cpp   | 18 ++++++++++
 apps/openmw/mwclass/clothing.hpp   |  4 +++
 apps/openmw/mwclass/container.cpp  | 18 ++++++++++
 apps/openmw/mwclass/container.hpp  |  4 +++
 apps/openmw/mwclass/creature.cpp   | 18 ++++++++++
 apps/openmw/mwclass/creature.hpp   |  4 +++
 apps/openmw/mwclass/door.cpp       | 18 ++++++++++
 apps/openmw/mwclass/door.hpp       |  4 +++
 apps/openmw/mwclass/ingredient.cpp | 18 ++++++++++
 apps/openmw/mwclass/ingredient.hpp |  4 +++
 apps/openmw/mwclass/light.cpp      | 28 +++++++++++++++
 apps/openmw/mwclass/light.hpp      |  4 +++
 apps/openmw/mwclass/lockpick.cpp   | 18 ++++++++++
 apps/openmw/mwclass/lockpick.hpp   |  4 +++
 apps/openmw/mwclass/misc.cpp       | 18 ++++++++++
 apps/openmw/mwclass/misc.hpp       |  4 +++
 apps/openmw/mwclass/npc.cpp        | 35 +++++++++++++++++-
 apps/openmw/mwclass/npc.hpp        |  4 +++
 apps/openmw/mwclass/potion.cpp     | 18 ++++++++++
 apps/openmw/mwclass/potion.hpp     |  4 +++
 apps/openmw/mwclass/probe.cpp      | 18 ++++++++++
 apps/openmw/mwclass/probe.hpp      |  4 +++
 apps/openmw/mwclass/repair.cpp     | 18 ++++++++++
 apps/openmw/mwclass/repair.hpp     |  4 +++
 apps/openmw/mwclass/static.cpp     | 20 +++++++++++
 apps/openmw/mwclass/static.hpp     |  4 +++
 apps/openmw/mwclass/weapon.cpp     | 18 ++++++++++
 apps/openmw/mwclass/weapon.hpp     |  4 +++
 apps/openmw/mwrender/cellimp.cpp   | 58 ++----------------------------
 37 files changed, 426 insertions(+), 57 deletions(-)

diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index 3cdc1f850..69a510803 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -7,8 +7,26 @@
 
 #include "../mwworld/ptr.hpp"
 
+#include "../mwrender/cellimp.hpp"
+
 namespace MWClass
 {
+    void Activator::insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+        MWWorld::Environment& environment) const
+    {
+        ESMS::LiveCellRef<ESM::Activator, MWWorld::RefData> *ref =
+            ptr.get<ESM::Activator>();
+
+        assert (ref->base != NULL);
+        const std::string &model = ref->base->model;
+        if (!model.empty())
+        {
+            cellRender.insertBegin (ref->ref);
+            cellRender.insertMesh ("meshes\\" + model);
+            ref->mData.setHandle (cellRender.insertEnd (ref->mData.isEnabled()));
+        }
+    }
+
     std::string Activator::getName (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Activator, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/activator.hpp b/apps/openmw/mwclass/activator.hpp
index 66821a7c5..3b48796ac 100644
--- a/apps/openmw/mwclass/activator.hpp
+++ b/apps/openmw/mwclass/activator.hpp
@@ -9,6 +9,10 @@ namespace MWClass
     {
         public:
 
+            virtual void insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+                MWWorld::Environment& environment) const;
+            ///< Add reference into a cell for rendering
+
             virtual std::string getName (const MWWorld::Ptr& ptr) const;
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index 4b94d78d1..007b2ca77 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -8,10 +8,28 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/cellimp.hpp"
+
 #include "containerutil.hpp"
 
 namespace MWClass
 {
+    void Apparatus::insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+        MWWorld::Environment& environment) const
+    {
+        ESMS::LiveCellRef<ESM::Apparatus, MWWorld::RefData> *ref =
+            ptr.get<ESM::Apparatus>();
+
+        assert (ref->base != NULL);
+        const std::string &model = ref->base->model;
+        if (!model.empty())
+        {
+            cellRender.insertBegin (ref->ref);
+            cellRender.insertMesh ("meshes\\" + model);
+            ref->mData.setHandle (cellRender.insertEnd (ref->mData.isEnabled()));
+        }
+    }
+
     std::string Apparatus::getName (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Apparatus, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/apparatus.hpp b/apps/openmw/mwclass/apparatus.hpp
index 4a514c94d..c2e6e25e1 100644
--- a/apps/openmw/mwclass/apparatus.hpp
+++ b/apps/openmw/mwclass/apparatus.hpp
@@ -9,6 +9,10 @@ namespace MWClass
     {
         public:
 
+            virtual void insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+                MWWorld::Environment& environment) const;
+            ///< Add reference into a cell for rendering
+
             virtual std::string getName (const MWWorld::Ptr& ptr) const;
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index f4236b5f6..5c06077b2 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -8,10 +8,28 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/cellimp.hpp"
+
 #include "containerutil.hpp"
 
 namespace MWClass
 {
+    void Armor::insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+        MWWorld::Environment& environment) const
+    {
+        ESMS::LiveCellRef<ESM::Armor, MWWorld::RefData> *ref =
+            ptr.get<ESM::Armor>();
+
+        assert (ref->base != NULL);
+        const std::string &model = ref->base->model;
+        if (!model.empty())
+        {
+            cellRender.insertBegin (ref->ref);
+            cellRender.insertMesh ("meshes\\" + model);
+            ref->mData.setHandle (cellRender.insertEnd (ref->mData.isEnabled()));
+        }
+    }
+
     std::string Armor::getName (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Armor, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/armor.hpp b/apps/openmw/mwclass/armor.hpp
index 217a74a76..040342a69 100644
--- a/apps/openmw/mwclass/armor.hpp
+++ b/apps/openmw/mwclass/armor.hpp
@@ -9,6 +9,10 @@ namespace MWClass
     {
         public:
 
+            virtual void insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+                MWWorld::Environment& environment) const;
+            ///< Add reference into a cell for rendering
+
             virtual std::string getName (const MWWorld::Ptr& ptr) const;
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index 3bea7d5b9..179a060c6 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -8,10 +8,28 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/cellimp.hpp"
+
 #include "containerutil.hpp"
 
 namespace MWClass
 {
+    void Book::insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+        MWWorld::Environment& environment) const
+    {
+        ESMS::LiveCellRef<ESM::Book, MWWorld::RefData> *ref =
+            ptr.get<ESM::Book>();
+
+        assert (ref->base != NULL);
+        const std::string &model = ref->base->model;
+        if (!model.empty())
+        {
+            cellRender.insertBegin (ref->ref);
+            cellRender.insertMesh ("meshes\\" + model);
+            ref->mData.setHandle (cellRender.insertEnd (ref->mData.isEnabled()));
+        }
+    }
+
     std::string Book::getName (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Book, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/book.hpp b/apps/openmw/mwclass/book.hpp
index 3f15e2278..70d1bca3b 100644
--- a/apps/openmw/mwclass/book.hpp
+++ b/apps/openmw/mwclass/book.hpp
@@ -9,6 +9,10 @@ namespace MWClass
     {
         public:
 
+            virtual void insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+                MWWorld::Environment& environment) const;
+            ///< Add reference into a cell for rendering
+
             virtual std::string getName (const MWWorld::Ptr& ptr) const;
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index c0e43bc3e..c3bbfa9f0 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -8,10 +8,28 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/cellimp.hpp"
+
 #include "containerutil.hpp"
 
 namespace MWClass
 {
+    void Clothing::insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+        MWWorld::Environment& environment) const
+    {
+        ESMS::LiveCellRef<ESM::Clothing, MWWorld::RefData> *ref =
+            ptr.get<ESM::Clothing>();
+
+        assert (ref->base != NULL);
+        const std::string &model = ref->base->model;
+        if (!model.empty())
+        {
+            cellRender.insertBegin (ref->ref);
+            cellRender.insertMesh ("meshes\\" + model);
+            ref->mData.setHandle (cellRender.insertEnd (ref->mData.isEnabled()));
+        }
+    }
+
     std::string Clothing::getName (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Clothing, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/clothing.hpp b/apps/openmw/mwclass/clothing.hpp
index ea358be68..fb88e25df 100644
--- a/apps/openmw/mwclass/clothing.hpp
+++ b/apps/openmw/mwclass/clothing.hpp
@@ -9,6 +9,10 @@ namespace MWClass
     {
         public:
 
+            virtual void insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+                MWWorld::Environment& environment) const;
+            ///< Add reference into a cell for rendering
+
             virtual std::string getName (const MWWorld::Ptr& ptr) const;
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 0cc516308..9c1ed7a89 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -7,8 +7,26 @@
 
 #include "../mwworld/ptr.hpp"
 
+#include "../mwrender/cellimp.hpp"
+
 namespace MWClass
 {
+    void Container::insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+        MWWorld::Environment& environment) const
+    {
+        ESMS::LiveCellRef<ESM::Container, MWWorld::RefData> *ref =
+            ptr.get<ESM::Container>();
+
+        assert (ref->base != NULL);
+        const std::string &model = ref->base->model;
+        if (!model.empty())
+        {
+            cellRender.insertBegin (ref->ref);
+            cellRender.insertMesh ("meshes\\" + model);
+            ref->mData.setHandle (cellRender.insertEnd (ref->mData.isEnabled()));
+        }
+    }
+
     std::string Container::getName (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Container, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/container.hpp b/apps/openmw/mwclass/container.hpp
index baeac23c7..de54a9e68 100644
--- a/apps/openmw/mwclass/container.hpp
+++ b/apps/openmw/mwclass/container.hpp
@@ -9,6 +9,10 @@ namespace MWClass
     {
         public:
 
+            virtual void insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+                MWWorld::Environment& environment) const;
+            ///< Add reference into a cell for rendering
+
             virtual std::string getName (const MWWorld::Ptr& ptr) const;
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 8525e9142..86adfb71a 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -8,8 +8,26 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontalk.hpp"
 
+#include "../mwrender/cellimp.hpp"
+
 namespace MWClass
 {
+    void Creature::insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+        MWWorld::Environment& environment) const
+    {
+        ESMS::LiveCellRef<ESM::Creature, MWWorld::RefData> *ref =
+            ptr.get<ESM::Creature>();
+
+        assert (ref->base != NULL);
+        const std::string &model = ref->base->model;
+        if (!model.empty())
+        {
+            cellRender.insertBegin (ref->ref);
+            cellRender.insertMesh ("meshes\\" + model);
+            ref->mData.setHandle (cellRender.insertEnd (ref->mData.isEnabled()));
+        }
+    }
+
     std::string Creature::getName (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Creature, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index e964a7708..18771491e 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -9,6 +9,10 @@ namespace MWClass
     {
         public:
 
+            virtual void insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+                MWWorld::Environment& environment) const;
+            ///< Add reference into a cell for rendering
+
             virtual std::string getName (const MWWorld::Ptr& ptr) const;
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 2c4bd3562..6fd8f996c 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -13,8 +13,26 @@
 #include "../mwworld/environment.hpp"
 #include "../mwworld/world.hpp"
 
+#include "../mwrender/cellimp.hpp"
+
 namespace MWClass
 {
+    void Door::insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+        MWWorld::Environment& environment) const
+    {
+        ESMS::LiveCellRef<ESM::Door, MWWorld::RefData> *ref =
+            ptr.get<ESM::Door>();
+
+        assert (ref->base != NULL);
+        const std::string &model = ref->base->model;
+        if (!model.empty())
+        {
+            cellRender.insertBegin (ref->ref);
+            cellRender.insertMesh ("meshes\\" + model);
+            ref->mData.setHandle (cellRender.insertEnd (ref->mData.isEnabled()));
+        }
+    }
+
     std::string Door::getName (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Door, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/door.hpp b/apps/openmw/mwclass/door.hpp
index fa3b6d657..b6bf8808e 100644
--- a/apps/openmw/mwclass/door.hpp
+++ b/apps/openmw/mwclass/door.hpp
@@ -9,6 +9,10 @@ namespace MWClass
     {
         public:
 
+            virtual void insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+                MWWorld::Environment& environment) const;
+            ///< Add reference into a cell for rendering
+
             virtual std::string getName (const MWWorld::Ptr& ptr) const;
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index 9162384af..29d66d012 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -8,10 +8,28 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/cellimp.hpp"
+
 #include "containerutil.hpp"
 
 namespace MWClass
 {
+    void Ingredient::insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+        MWWorld::Environment& environment) const
+    {
+        ESMS::LiveCellRef<ESM::Ingredient, MWWorld::RefData> *ref =
+            ptr.get<ESM::Ingredient>();
+
+        assert (ref->base != NULL);
+        const std::string &model = ref->base->model;
+        if (!model.empty())
+        {
+            cellRender.insertBegin (ref->ref);
+            cellRender.insertMesh ("meshes\\" + model);
+            ref->mData.setHandle (cellRender.insertEnd (ref->mData.isEnabled()));
+        }
+    }
+
     std::string Ingredient::getName (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Ingredient, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/ingredient.hpp b/apps/openmw/mwclass/ingredient.hpp
index d742fae8b..8b781ba2f 100644
--- a/apps/openmw/mwclass/ingredient.hpp
+++ b/apps/openmw/mwclass/ingredient.hpp
@@ -9,6 +9,10 @@ namespace MWClass
     {
         public:
 
+            virtual void insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+                MWWorld::Environment& environment) const;
+            ///< Add reference into a cell for rendering
+
             virtual std::string getName (const MWWorld::Ptr& ptr) const;
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index 7cb363bf8..73ef69dc5 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -9,10 +9,38 @@
 #include "../mwworld/actiontake.hpp"
 #include "../mwworld/nullaction.hpp"
 
+#include "../mwrender/cellimp.hpp"
+
 #include "containerutil.hpp"
 
 namespace MWClass
 {
+    void Light::insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+        MWWorld::Environment& environment) const
+    {
+        ESMS::LiveCellRef<ESM::Light, MWWorld::RefData> *ref =
+            ptr.get<ESM::Light>();
+
+        assert (ref->base != NULL);
+        const std::string &model = ref->base->model;
+        if (!model.empty())
+        {
+            cellRender.insertBegin (ref->ref);
+
+            cellRender.insertMesh ("meshes\\" + model);
+
+            // Extract the color and convert to floating point
+            const int color = ref->base->data.color;
+            const float r = ((color >>  0) & 0xFF) / 255.0f;
+            const float g = ((color >>  8) & 0xFF) / 255.0f;
+            const float b = ((color >> 16) & 0xFF) / 255.0f;
+            const float radius = float (ref->base->data.radius);
+            cellRender.insertLight (r, g, b, radius);
+
+            ref->mData.setHandle (cellRender.insertEnd (ref->mData.isEnabled()));
+        }
+    }
+
     std::string Light::getName (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Light, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/light.hpp b/apps/openmw/mwclass/light.hpp
index 6d08d557c..9ac5c586b 100644
--- a/apps/openmw/mwclass/light.hpp
+++ b/apps/openmw/mwclass/light.hpp
@@ -9,6 +9,10 @@ namespace MWClass
     {
         public:
 
+            virtual void insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+                MWWorld::Environment& environment) const;
+            ///< Add reference into a cell for rendering
+
             virtual std::string getName (const MWWorld::Ptr& ptr) const;
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index ab1969480..c87d1e128 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -8,10 +8,28 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/cellimp.hpp"
+
 #include "containerutil.hpp"
 
 namespace MWClass
 {
+    void Lockpick::insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+        MWWorld::Environment& environment) const
+    {
+        ESMS::LiveCellRef<ESM::Tool, MWWorld::RefData> *ref =
+            ptr.get<ESM::Tool>();
+
+        assert (ref->base != NULL);
+        const std::string &model = ref->base->model;
+        if (!model.empty())
+        {
+            cellRender.insertBegin (ref->ref);
+            cellRender.insertMesh ("meshes\\" + model);
+            ref->mData.setHandle (cellRender.insertEnd (ref->mData.isEnabled()));
+        }
+    }
+
     std::string Lockpick::getName (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Tool, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/lockpick.hpp b/apps/openmw/mwclass/lockpick.hpp
index e15d9daee..bb9866b8c 100644
--- a/apps/openmw/mwclass/lockpick.hpp
+++ b/apps/openmw/mwclass/lockpick.hpp
@@ -9,6 +9,10 @@ namespace MWClass
     {
         public:
 
+            virtual void insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+                MWWorld::Environment& environment) const;
+            ///< Add reference into a cell for rendering
+
             virtual std::string getName (const MWWorld::Ptr& ptr) const;
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index f29a0be1f..57dca3148 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -8,10 +8,28 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/cellimp.hpp"
+
 #include "containerutil.hpp"
 
 namespace MWClass
 {
+    void Misc::insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+        MWWorld::Environment& environment) const
+    {
+        ESMS::LiveCellRef<ESM::Misc, MWWorld::RefData> *ref =
+            ptr.get<ESM::Misc>();
+
+        assert (ref->base != NULL);
+        const std::string &model = ref->base->model;
+        if (!model.empty())
+        {
+            cellRender.insertBegin (ref->ref);
+            cellRender.insertMesh ("meshes\\" + model);
+            ref->mData.setHandle (cellRender.insertEnd (ref->mData.isEnabled()));
+        }
+    }
+
     std::string Misc::getName (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Misc, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/misc.hpp b/apps/openmw/mwclass/misc.hpp
index 01542baed..0da1f0d3a 100644
--- a/apps/openmw/mwclass/misc.hpp
+++ b/apps/openmw/mwclass/misc.hpp
@@ -9,6 +9,10 @@ namespace MWClass
     {
         public:
 
+            virtual void insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+                MWWorld::Environment& environment) const;
+            ///< Add reference into a cell for rendering
+
             virtual std::string getName (const MWWorld::Ptr& ptr) const;
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 829b17e7e..09b589c67 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -7,9 +7,42 @@
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontalk.hpp"
+#include "../mwworld/environment.hpp"
+#include "../mwworld/world.hpp"
+
+#include "../mwrender/cellimp.hpp"
 
 namespace MWClass
 {
+    void Npc::insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+        MWWorld::Environment& environment) const
+    {
+        ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData> *ref =
+            ptr.get<ESM::NPC>();
+
+        assert (ref->base != NULL);
+
+        std::string headID = ref->base->head;
+
+        //get the part of the bodypart id which describes the race and the gender
+        std::string bodyRaceID = headID.substr(0, headID.find_last_of("head_") - 4);
+        std::string headModel = "meshes\\" +
+            environment.mWorld->getStore().bodyParts.find(headID)->model;
+
+        cellRender.insertBegin (ref->ref);
+        cellRender.insertMesh (headModel);
+
+        //TODO: define consts for each bodypart e.g. chest, foot, wrist... and put the parts in the
+        // right place
+        const ESM::BodyPart *bodyPart =
+            environment.mWorld->getStore().bodyParts.search (bodyRaceID + "chest");
+
+        if (bodyPart)
+            cellRender.insertMesh("meshes\\" + bodyPart->model);
+
+        ref->mData.setHandle (cellRender.insertEnd (ref->mData.isEnabled()));
+    }
+
     std::string Npc::getName (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData> *ref =
@@ -49,7 +82,7 @@ namespace MWClass
         const MWWorld::Ptr& actor, const MWWorld::Environment& environment) const
     {
         return boost::shared_ptr<MWWorld::Action> (new MWWorld::ActionTalk (ptr));
-	}
+    }
 
     MWWorld::ContainerStore<MWWorld::RefData>& Npc::getContainerStore (const MWWorld::Ptr& ptr)
         const
diff --git a/apps/openmw/mwclass/npc.hpp b/apps/openmw/mwclass/npc.hpp
index a2dd6f470..af00ff198 100644
--- a/apps/openmw/mwclass/npc.hpp
+++ b/apps/openmw/mwclass/npc.hpp
@@ -9,6 +9,10 @@ namespace MWClass
     {
         public:
 
+            virtual void insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+                MWWorld::Environment& environment) const;
+            ///< Add reference into a cell for rendering
+
             virtual std::string getName (const MWWorld::Ptr& ptr) const;
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index 0799b2031..3fe38542b 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -8,10 +8,28 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/cellimp.hpp"
+
 #include "containerutil.hpp"
 
 namespace MWClass
 {
+    void Potion::insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+        MWWorld::Environment& environment) const
+    {
+        ESMS::LiveCellRef<ESM::Potion, MWWorld::RefData> *ref =
+            ptr.get<ESM::Potion>();
+
+        assert (ref->base != NULL);
+        const std::string &model = ref->base->model;
+        if (!model.empty())
+        {
+            cellRender.insertBegin (ref->ref);
+            cellRender.insertMesh ("meshes\\" + model);
+            ref->mData.setHandle (cellRender.insertEnd (ref->mData.isEnabled()));
+        }
+    }
+
     std::string Potion::getName (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Potion, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/potion.hpp b/apps/openmw/mwclass/potion.hpp
index 208c26c56..9bf3b34a8 100644
--- a/apps/openmw/mwclass/potion.hpp
+++ b/apps/openmw/mwclass/potion.hpp
@@ -9,6 +9,10 @@ namespace MWClass
     {
         public:
 
+            virtual void insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+                MWWorld::Environment& environment) const;
+            ///< Add reference into a cell for rendering
+
             virtual std::string getName (const MWWorld::Ptr& ptr) const;
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index 08ec391a8..bc6c4ba19 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -8,10 +8,28 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/cellimp.hpp"
+
 #include "containerutil.hpp"
 
 namespace MWClass
 {
+    void Probe::insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+        MWWorld::Environment& environment) const
+    {
+        ESMS::LiveCellRef<ESM::Probe, MWWorld::RefData> *ref =
+            ptr.get<ESM::Probe>();
+
+        assert (ref->base != NULL);
+        const std::string &model = ref->base->model;
+        if (!model.empty())
+        {
+            cellRender.insertBegin (ref->ref);
+            cellRender.insertMesh ("meshes\\" + model);
+            ref->mData.setHandle (cellRender.insertEnd (ref->mData.isEnabled()));
+        }
+    }
+
     std::string Probe::getName (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Probe, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/probe.hpp b/apps/openmw/mwclass/probe.hpp
index c17d53dab..11399d2f6 100644
--- a/apps/openmw/mwclass/probe.hpp
+++ b/apps/openmw/mwclass/probe.hpp
@@ -9,6 +9,10 @@ namespace MWClass
     {
         public:
 
+            virtual void insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+                MWWorld::Environment& environment) const;
+            ///< Add reference into a cell for rendering
+
             virtual std::string getName (const MWWorld::Ptr& ptr) const;
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index 9ed7f0e77..253569afe 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -8,10 +8,28 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/cellimp.hpp"
+
 #include "containerutil.hpp"
 
 namespace MWClass
 {
+    void Repair::insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+        MWWorld::Environment& environment) const
+    {
+        ESMS::LiveCellRef<ESM::Repair, MWWorld::RefData> *ref =
+            ptr.get<ESM::Repair>();
+
+        assert (ref->base != NULL);
+        const std::string &model = ref->base->model;
+        if (!model.empty())
+        {
+            cellRender.insertBegin (ref->ref);
+            cellRender.insertMesh ("meshes\\" + model);
+            ref->mData.setHandle (cellRender.insertEnd (ref->mData.isEnabled()));
+        }
+    }
+
     std::string Repair::getName (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Repair, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/repair.hpp b/apps/openmw/mwclass/repair.hpp
index 52d045ebe..3da591e01 100644
--- a/apps/openmw/mwclass/repair.hpp
+++ b/apps/openmw/mwclass/repair.hpp
@@ -9,6 +9,10 @@ namespace MWClass
     {
         public:
 
+            virtual void insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+                MWWorld::Environment& environment) const;
+            ///< Add reference into a cell for rendering
+
             virtual std::string getName (const MWWorld::Ptr& ptr) const;
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
diff --git a/apps/openmw/mwclass/static.cpp b/apps/openmw/mwclass/static.cpp
index f2bc4f635..211d239c6 100644
--- a/apps/openmw/mwclass/static.cpp
+++ b/apps/openmw/mwclass/static.cpp
@@ -3,8 +3,28 @@
 
 #include <components/esm/loadstat.hpp>
 
+#include "../mwworld/ptr.hpp"
+
+#include "../mwrender/cellimp.hpp"
+
 namespace MWClass
 {
+    void Static::insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+        MWWorld::Environment& environment) const
+    {
+        ESMS::LiveCellRef<ESM::Static, MWWorld::RefData> *ref =
+            ptr.get<ESM::Static>();
+
+        assert (ref->base != NULL);
+        const std::string &model = ref->base->model;
+        if (!model.empty())
+        {
+            cellRender.insertBegin (ref->ref);
+            cellRender.insertMesh ("meshes\\" + model);
+            ref->mData.setHandle (cellRender.insertEnd (ref->mData.isEnabled()));
+        }
+    }
+
     std::string Static::getName (const MWWorld::Ptr& ptr) const
     {
         return "";
diff --git a/apps/openmw/mwclass/static.hpp b/apps/openmw/mwclass/static.hpp
index fb8080182..abbf6cd5f 100644
--- a/apps/openmw/mwclass/static.hpp
+++ b/apps/openmw/mwclass/static.hpp
@@ -9,6 +9,10 @@ namespace MWClass
     {
         public:
 
+            virtual void insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+                MWWorld::Environment& environment) const;
+            ///< Add reference into a cell for rendering
+
             virtual std::string getName (const MWWorld::Ptr& ptr) const;
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index c292c32dd..5a941360a 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -8,10 +8,28 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/cellimp.hpp"
+
 #include "containerutil.hpp"
 
 namespace MWClass
 {
+    void Weapon::insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+        MWWorld::Environment& environment) const
+    {
+        ESMS::LiveCellRef<ESM::Weapon, MWWorld::RefData> *ref =
+            ptr.get<ESM::Weapon>();
+
+        assert (ref->base != NULL);
+        const std::string &model = ref->base->model;
+        if (!model.empty())
+        {
+            cellRender.insertBegin (ref->ref);
+            cellRender.insertMesh ("meshes\\" + model);
+            ref->mData.setHandle (cellRender.insertEnd (ref->mData.isEnabled()));
+        }
+    }
+
     std::string Weapon::getName (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Weapon, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/weapon.hpp b/apps/openmw/mwclass/weapon.hpp
index 6bc96381c..d9c7653dd 100644
--- a/apps/openmw/mwclass/weapon.hpp
+++ b/apps/openmw/mwclass/weapon.hpp
@@ -9,6 +9,10 @@ namespace MWClass
     {
         public:
 
+            virtual void insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
+                MWWorld::Environment& environment) const;
+            ///< Add reference into a cell for rendering
+
             virtual std::string getName (const MWWorld::Ptr& ptr) const;
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
diff --git a/apps/openmw/mwrender/cellimp.cpp b/apps/openmw/mwrender/cellimp.cpp
index 1f1034379..0b5e7c951 100644
--- a/apps/openmw/mwrender/cellimp.cpp
+++ b/apps/openmw/mwrender/cellimp.cpp
@@ -7,60 +7,6 @@
 
 using namespace MWRender;
 
-template<typename T>
-void insertObj(CellRenderImp& cellRender, T& liveRef, const ESMS::ESMStore& store)
-{
-  assert (liveRef.base != NULL);
-  const std::string &model = liveRef.base->model;
-  if(!model.empty())
-  {
-    cellRender.insertBegin (liveRef.ref);
-    cellRender.insertMesh ("meshes\\" + model);
-    liveRef.mData.setHandle (cellRender.insertEnd (liveRef.mData.isEnabled()));
-  }
-}
-
-template<>
-void insertObj(CellRenderImp& cellRender, ESMS::LiveCellRef<ESM::Light, MWWorld::RefData>& liveRef, const ESMS::ESMStore& store)
-{
-  assert (liveRef.base != NULL);
-  const std::string &model = liveRef.base->model;
-  if(!model.empty())
-  {
-    cellRender.insertBegin (liveRef.ref);
-
-    cellRender.insertMesh ("meshes\\" + model);
-
-    // Extract the color and convert to floating point
-    const int color = liveRef.base->data.color;
-    const float r = ((color >>  0) & 0xFF) / 255.0f;
-    const float g = ((color >>  8) & 0xFF) / 255.0f;
-    const float b = ((color >> 16) & 0xFF) / 255.0f;
-    const float radius = float(liveRef.base->data.radius);
-    cellRender.insertLight(r, g, b, radius);
-
-    liveRef.mData.setHandle (cellRender.insertEnd (liveRef.mData.isEnabled()));
-  }
-}
-
-template<>
-void insertObj(CellRenderImp& cellRender, ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData>& liveRef, const ESMS::ESMStore& store)
-{
-    std::string headID = liveRef.base->head;
-
-    //get the part of the bodypart id which describes the race and the gender
-    std::string bodyRaceID = headID.substr(0, headID.find_last_of("head_") - 4);
-    std::string headModel = "meshes\\" + store.bodyParts.find(headID)->model;
-
-    cellRender.insertBegin(liveRef.ref);
-    cellRender.insertMesh(headModel);
-
-    //TODO: define consts for each bodypart e.g. chest, foot, wrist... and put the parts in the right place
-    cellRender.insertMesh("meshes\\" + store.bodyParts.find(bodyRaceID + "chest")->model);
-
-    liveRef.mData.setHandle (cellRender.insertEnd (liveRef.mData.isEnabled()));
-}
-
 template<typename T>
 void insertCellRefList (CellRenderImp& cellRender, MWWorld::Environment& environment,
     T& cellRefList, ESMS::CellStore<MWWorld::RefData> &cell)
@@ -93,8 +39,8 @@ void CellRenderImp::insertCell(ESMS::CellStore<MWWorld::RefData> &cell,
   insertCellRefList (*this, environment, cell.creatures, cell);
   insertCellRefList (*this, environment, cell.doors, cell);
   insertCellRefList (*this, environment, cell.ingreds, cell);
-  //  insertCellRefList (*this, environment, cell.creatureLists, cell);
-  //  insertCellRefList (*this, environment, cell.itemLists, cell);
+  insertCellRefList (*this, environment, cell.creatureLists, cell);
+  insertCellRefList (*this, environment, cell.itemLists, cell);
   insertCellRefList (*this, environment, cell.lights, cell);
   insertCellRefList (*this, environment, cell.lockpicks, cell);
   insertCellRefList (*this, environment, cell.miscItems, cell);

From d57c984517ecfcd745dc5eb5321e7485bfbd84f8 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 14 Aug 2010 11:27:13 +0200
Subject: [PATCH 4/5] added enable and disable functions to class hierarchy;
 fixed a bug regarding actors in cellings being actived

---
 apps/openmw/mwclass/creature.cpp | 13 +++++++++++++
 apps/openmw/mwclass/creature.hpp |  6 ++++++
 apps/openmw/mwclass/npc.cpp      | 12 ++++++++++++
 apps/openmw/mwclass/npc.hpp      |  6 ++++++
 apps/openmw/mwrender/cellimp.cpp |  6 +++++-
 apps/openmw/mwworld/class.cpp    | 10 ++++++++++
 apps/openmw/mwworld/class.hpp    | 10 ++++++++++
 apps/openmw/mwworld/world.cpp    | 25 +++++++------------------
 8 files changed, 69 insertions(+), 19 deletions(-)

diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 86adfb71a..8757c93fd 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -7,9 +7,12 @@
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontalk.hpp"
+#include "../mwworld/environment.hpp"
 
 #include "../mwrender/cellimp.hpp"
 
+#include "../mwmechanics/mechanicsmanager.hpp"
+
 namespace MWClass
 {
     void Creature::insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
@@ -28,6 +31,16 @@ namespace MWClass
         }
     }
 
+    void Creature::enable (const MWWorld::Ptr& ptr, MWWorld::Environment& environment) const
+    {
+        environment.mMechanicsManager->addActor (ptr);
+    }
+
+    void Creature::disable (const MWWorld::Ptr& ptr, MWWorld::Environment& environment) const
+    {
+        environment.mMechanicsManager->removeActor (ptr);
+    }
+
     std::string Creature::getName (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Creature, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index 18771491e..ec354a015 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -13,6 +13,12 @@ namespace MWClass
                 MWWorld::Environment& environment) const;
             ///< Add reference into a cell for rendering
 
+            virtual void enable (const MWWorld::Ptr& ptr, MWWorld::Environment& environment) const;
+            ///< Enable reference; only does the non-rendering part
+
+            virtual void disable (const MWWorld::Ptr& ptr, MWWorld::Environment& environment) const;
+            ///< Enable reference; only does the non-rendering part
+
             virtual std::string getName (const MWWorld::Ptr& ptr) const;
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 09b589c67..1aae8928d 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -12,6 +12,8 @@
 
 #include "../mwrender/cellimp.hpp"
 
+#include "../mwmechanics/mechanicsmanager.hpp"
+
 namespace MWClass
 {
     void Npc::insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender,
@@ -43,6 +45,16 @@ namespace MWClass
         ref->mData.setHandle (cellRender.insertEnd (ref->mData.isEnabled()));
     }
 
+    void Npc::enable (const MWWorld::Ptr& ptr, MWWorld::Environment& environment) const
+    {
+        environment.mMechanicsManager->addActor (ptr);
+    }
+
+    void Npc::disable (const MWWorld::Ptr& ptr, MWWorld::Environment& environment) const
+    {
+        environment.mMechanicsManager->removeActor (ptr);
+    }
+
     std::string Npc::getName (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/npc.hpp b/apps/openmw/mwclass/npc.hpp
index af00ff198..1bbf427de 100644
--- a/apps/openmw/mwclass/npc.hpp
+++ b/apps/openmw/mwclass/npc.hpp
@@ -13,6 +13,12 @@ namespace MWClass
                 MWWorld::Environment& environment) const;
             ///< Add reference into a cell for rendering
 
+            virtual void enable (const MWWorld::Ptr& ptr, MWWorld::Environment& environment) const;
+            ///< Enable reference; only does the non-rendering part
+
+            virtual void disable (const MWWorld::Ptr& ptr, MWWorld::Environment& environment) const;
+            ///< Enable reference; only does the non-rendering part
+
             virtual std::string getName (const MWWorld::Ptr& ptr) const;
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
diff --git a/apps/openmw/mwrender/cellimp.cpp b/apps/openmw/mwrender/cellimp.cpp
index 0b5e7c951..d1e1ec8f9 100644
--- a/apps/openmw/mwrender/cellimp.cpp
+++ b/apps/openmw/mwrender/cellimp.cpp
@@ -20,7 +20,11 @@ void insertCellRefList (CellRenderImp& cellRender, MWWorld::Environment& environ
             it != cellRefList.list.end(); it++)
         {
             if (it->mData.getCount())
-                class_.insertObj (MWWorld::Ptr (&*it, &cell), cellRender, environment);
+            {
+                MWWorld::Ptr ptr (&*it, &cell);
+                class_.insertObj (ptr, cellRender, environment);
+                class_.enable (ptr, environment);
+            }
         }
     }
 }
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index b7498dcdd..386ba650e 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -20,6 +20,16 @@ namespace MWWorld
 
     }
 
+    void Class::enable (const Ptr& ptr, MWWorld::Environment& environment) const
+    {
+
+    }
+
+    void Class::disable (const Ptr& ptr, MWWorld::Environment& environment) const
+    {
+
+    }
+
     MWMechanics::CreatureStats& Class::getCreatureStats (const Ptr& ptr) const
     {
         throw std::runtime_error ("class does not have creature stats");
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 83269957a..d230605da 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -46,6 +46,16 @@ namespace MWWorld
                 MWWorld::Environment& environment) const;
             ///< Add reference into a cell for rendering (default implementation: don't render anything).
 
+            virtual void enable (const Ptr& ptr, MWWorld::Environment& environment) const;
+            ///< Enable reference; only does the non-rendering part (default implementation: ignore)
+            /// \attention This is not the same as the script instruction with the same name. References
+            /// should only be enabled while in an active cell.
+
+            virtual void disable (const Ptr& ptr, MWWorld::Environment& environment) const;
+            ///< Enable reference; only does the non-rendering part (default implementation: ignore)
+            /// \attention This is not the same as the script instruction with the same name. References
+            /// should only be enabled while in an active cell.
+
             virtual std::string getName (const Ptr& ptr) const = 0;
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
diff --git a/apps/openmw/mwworld/world.cpp b/apps/openmw/mwworld/world.cpp
index 620751f61..5744779da 100644
--- a/apps/openmw/mwworld/world.cpp
+++ b/apps/openmw/mwworld/world.cpp
@@ -15,6 +15,7 @@
 
 #include "ptr.hpp"
 #include "environment.hpp"
+#include "class.hpp"
 
 namespace
 {
@@ -374,12 +375,8 @@ namespace MWWorld
             {
                 render->enable (reference.getRefData().getHandle());
 
-                if (mActiveCells.find (reference.getCell())!=mActiveCells.end() &&
-                    (reference.getType()==typeid (ESMS::LiveCellRef<ESM::NPC, RefData>) ||
-                    reference.getType()==typeid (ESMS::LiveCellRef<ESM::Creature, RefData>)))
-                {
-                    mEnvironment.mMechanicsManager->addActor (reference);
-                }
+                if (mActiveCells.find (reference.getCell())!=mActiveCells.end())
+                    Class::get (reference).enable (reference, mEnvironment);
             }
         }
     }
@@ -394,12 +391,8 @@ namespace MWWorld
             {
                 render->disable (reference.getRefData().getHandle());
 
-                if (mActiveCells.find (reference.getCell())!=mActiveCells.end() &&
-                    (reference.getType()==typeid (ESMS::LiveCellRef<ESM::NPC, RefData>) ||
-                    reference.getType()==typeid (ESMS::LiveCellRef<ESM::Creature, RefData>)))
-                {
-                    mEnvironment.mMechanicsManager->removeActor (reference);
-                }
+                if (mActiveCells.find (reference.getCell())!=mActiveCells.end())
+                    Class::get (reference).disable (reference, mEnvironment);
             }
         }
     }
@@ -626,12 +619,8 @@ namespace MWWorld
                 render->deleteObject (ptr.getRefData().getHandle());
                 ptr.getRefData().setHandle ("");
 
-                if (mActiveCells.find (ptr.getCell())!=mActiveCells.end() &&
-                    (ptr.getType()==typeid (ESMS::LiveCellRef<ESM::NPC, RefData>) ||
-                    ptr.getType()==typeid (ESMS::LiveCellRef<ESM::Creature, RefData>)))
-                {
-                    mEnvironment.mMechanicsManager->removeActor (ptr);
-                }
+                if (mActiveCells.find (ptr.getCell())!=mActiveCells.end())
+                    Class::get (ptr).disable (ptr, mEnvironment);
             }
         }
     }

From 6f28bd9adff73cfdd91729adf7ff3be8528e700c Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 14 Aug 2010 11:39:32 +0200
Subject: [PATCH 5/5] handle sounds when enabling/disabling

---
 apps/openmw/mwclass/light.cpp | 14 ++++++++++++++
 apps/openmw/mwclass/light.hpp |  5 +++++
 apps/openmw/mwworld/world.cpp |  6 ++++++
 3 files changed, 25 insertions(+)

diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index 73ef69dc5..e57511452 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -8,9 +8,12 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 #include "../mwworld/nullaction.hpp"
+#include "../mwworld/environment.hpp"
 
 #include "../mwrender/cellimp.hpp"
 
+#include "../mwsound/soundmanager.hpp"
+
 #include "containerutil.hpp"
 
 namespace MWClass
@@ -41,6 +44,17 @@ namespace MWClass
         }
     }
 
+    void Light::enable (const MWWorld::Ptr& ptr, MWWorld::Environment& environment) const
+    {
+        ESMS::LiveCellRef<ESM::Light, MWWorld::RefData> *ref =
+            ptr.get<ESM::Light>();
+
+        if (!ref->base->sound.empty())
+        {
+            environment.mSoundManager->playSound3D (ptr, ref->base->sound, 1.0, 1.0, true);
+        }
+    }
+
     std::string Light::getName (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Light, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/light.hpp b/apps/openmw/mwclass/light.hpp
index 9ac5c586b..5a1a15b1d 100644
--- a/apps/openmw/mwclass/light.hpp
+++ b/apps/openmw/mwclass/light.hpp
@@ -13,6 +13,11 @@ namespace MWClass
                 MWWorld::Environment& environment) const;
             ///< Add reference into a cell for rendering
 
+            virtual void enable (const MWWorld::Ptr& ptr, MWWorld::Environment& environment) const;
+            ///< Enable reference; only does the non-rendering part
+            /// \attention This is not the same as the script instruction with the same name. References
+            /// should only be enabled while in an active cell.
+
             virtual std::string getName (const MWWorld::Ptr& ptr) const;
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
diff --git a/apps/openmw/mwworld/world.cpp b/apps/openmw/mwworld/world.cpp
index 5744779da..de69d7144 100644
--- a/apps/openmw/mwworld/world.cpp
+++ b/apps/openmw/mwworld/world.cpp
@@ -392,7 +392,10 @@ namespace MWWorld
                 render->disable (reference.getRefData().getHandle());
 
                 if (mActiveCells.find (reference.getCell())!=mActiveCells.end())
+                {
                     Class::get (reference).disable (reference, mEnvironment);
+                    mEnvironment.mSoundManager->stopSound3D (reference);
+                }
             }
         }
     }
@@ -620,7 +623,10 @@ namespace MWWorld
                 ptr.getRefData().setHandle ("");
 
                 if (mActiveCells.find (ptr.getCell())!=mActiveCells.end())
+                {
                     Class::get (ptr).disable (ptr, mEnvironment);
+                    mEnvironment.mSoundManager->stopSound3D (ptr);
+                }
             }
         }
     }