From 6a88133178988e687b6d59e9a2183de86754a023 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sun, 22 Jan 2012 11:00:40 +0100
Subject: [PATCH 1/8] Split refdata.hpp in a hpp and a cpp file

Prerequisite for the ContainerStore rewrite, which is a prerequisite for issue #117.
---
 apps/openmw/CMakeLists.txt      |  2 +-
 apps/openmw/mwworld/refdata.cpp | 88 ++++++++++++++++++++++++++++++
 apps/openmw/mwworld/refdata.hpp | 94 +++++++++------------------------
 3 files changed, 114 insertions(+), 70 deletions(-)
 create mode 100644 apps/openmw/mwworld/refdata.cpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index bbee7498a..c390f697a 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -16,7 +16,7 @@ set(GAME_HEADER
 source_group(game FILES ${GAME} ${GAME_HEADER})
 
 add_openmw_dir (mwrender
-    renderingmanager debugging sky player animation npcanimation creatureanimation actors objects renderinginterface 
+    renderingmanager debugging sky player animation npcanimation creatureanimation actors objects renderinginterface
     )
 
 add_openmw_dir (mwinput
diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
new file mode 100644
index 000000000..aed0b5ae0
--- /dev/null
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -0,0 +1,88 @@
+
+#include "refdata.hpp"
+
+namespace MWWorld
+{
+    RefData::RefData (const ESMS::CellRef& cellRef)
+    : mBaseNode(0), mHasLocals (false), mEnabled (true), mCount (1), mPosition (cellRef.pos)
+    {}
+
+    std::string RefData::getHandle()
+    {
+        return mBaseNode->getName();
+    }
+
+    Ogre::SceneNode* RefData::getBaseNode()
+    {
+        return mBaseNode;
+    }
+
+    void RefData::setBaseNode(Ogre::SceneNode* base)
+    {
+         mBaseNode = base;
+    }
+
+    int RefData::getCount() const
+    {
+        return mCount;
+    }
+
+    void RefData::setLocals (const ESM::Script& script)
+    {
+        if (!mHasLocals)
+        {
+            mLocals.configure (script);
+            mHasLocals = true;
+        }
+    }
+
+    void RefData::setCount (int count)
+    {
+        mCount = count;
+    }
+
+    MWScript::Locals& RefData::getLocals()
+    {
+        return mLocals;
+    }
+
+    bool RefData::isEnabled() const
+    {
+        return mEnabled;
+    }
+
+    void RefData::enable()
+    {
+        mEnabled = true;
+    }
+
+    void RefData::disable()
+    {
+        mEnabled = true;
+    }
+
+    boost::shared_ptr<MWMechanics::CreatureStats>& RefData::getCreatureStats()
+    {
+        return mCreatureStats;
+    }
+
+    boost::shared_ptr<MWMechanics::NpcStats>& RefData::getNpcStats()
+    {
+        return mNpcStats;
+    }
+
+    boost::shared_ptr<MWMechanics::Movement>& RefData::getMovement()
+    {
+        return mMovement;
+    }
+
+    boost::shared_ptr<ContainerStore<RefData> >& RefData::getContainerStore()
+    {
+        return mContainerStore;
+    }
+
+    ESM::Position& RefData::getPosition()
+    {
+        return mPosition;
+    }
+}
diff --git a/apps/openmw/mwworld/refdata.hpp b/apps/openmw/mwworld/refdata.hpp
index 9a91a27b5..7875c2e12 100644
--- a/apps/openmw/mwworld/refdata.hpp
+++ b/apps/openmw/mwworld/refdata.hpp
@@ -5,6 +5,8 @@
 
 #include <boost/shared_ptr.hpp>
 
+#include <Ogre.h>
+
 #include "../mwscript/locals.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"
@@ -12,7 +14,6 @@
 #include "../mwmechanics/movement.hpp"
 
 #include "containerstore.hpp"
-#include <Ogre.h>
 
 namespace ESM
 {
@@ -45,90 +46,45 @@ namespace MWWorld
 
             ESM::Position mPosition;
 
-
         public:
-            /// @param cr Used to copy constant data such as position into this class where it can
-            ///           be altered without effecting the original data. This makes it possible
-            ///           to reset the position as the orignal data is still held in the CellRef
-            RefData(const ESMS::CellRef& cr) : mBaseNode(0), mHasLocals (false), mEnabled (true),
-                                         mCount (1), mPosition(cr.pos) {}
 
+            /// @param cellRef Used to copy constant data such as position into this class where it can
+            /// be altered without effecting the original data. This makes it possible
+            /// to reset the position as the orignal data is still held in the CellRef
+            RefData (const ESMS::CellRef& cellRef);
 
-            std::string getHandle()
-            {
-                return mBaseNode->getName();
-            }
-            Ogre::SceneNode* getBaseNode(){
-                return mBaseNode;
-            }
-            void setBaseNode(Ogre::SceneNode* base){
-                 mBaseNode = base;
-            }
+            /// Return OGRE handle (may be empty).
+            std::string getHandle();
 
-            int getCount() const
-            {
-                return mCount;
-            }
+            /// Return OGRE base node (can be a null pointer).
+            Ogre::SceneNode* getBaseNode();
 
-            void setLocals (const ESM::Script& script)
-            {
-                if (!mHasLocals)
-                {
-                    mLocals.configure (script);
-                    mHasLocals = true;
-                }
-            }
+            /// Set OGRE base node (can be a null pointer).
+            void setBaseNode (Ogre::SceneNode* base);
 
+            int getCount() const;
 
-            void setCount (int count)
-            {
-                mCount = count;
-            }
+            void setLocals (const ESM::Script& script);
 
-            MWScript::Locals& getLocals()
-            {
-                return mLocals;
-            }
+            void setCount (int count);
 
-            bool isEnabled() const
-            {
-                return mEnabled;
-            }
+            MWScript::Locals& getLocals();
 
-            void enable()
-            {
-                mEnabled = true;
-            }
+            bool isEnabled() const;
 
-            void disable()
-            {
-                mEnabled = true;
-            }
+            void enable();
 
-            boost::shared_ptr<MWMechanics::CreatureStats>& getCreatureStats()
-            {
-                return mCreatureStats;
-            }
+            void disable();
 
-            boost::shared_ptr<MWMechanics::NpcStats>& getNpcStats()
-            {
-                return mNpcStats;
-            }
+            boost::shared_ptr<MWMechanics::CreatureStats>& getCreatureStats();
 
-            boost::shared_ptr<MWMechanics::Movement>& getMovement()
-            {
-                return mMovement;
-            }
+            boost::shared_ptr<MWMechanics::NpcStats>& getNpcStats();
 
-            boost::shared_ptr<ContainerStore<RefData> >& getContainerStore()
-            {
-                return mContainerStore;
-            }
+            boost::shared_ptr<MWMechanics::Movement>& getMovement();
 
-            ESM::Position& getPosition()
-            {
-                return mPosition;
-            }
+            boost::shared_ptr<ContainerStore<RefData> >& getContainerStore();
+
+            ESM::Position& getPosition();
     };
 }
 

From 7439c83623d0b6e627654ffc7c6ae802e2c747e8 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sun, 22 Jan 2012 11:20:05 +0100
Subject: [PATCH 2/8] Added custom copy-constructor, assignment-operator and
 destructor for RefData

Prerequisite for the ContainerStore rewrite, which is a prerequisite for issue #117.
---
 apps/openmw/mwworld/refdata.cpp | 60 +++++++++++++++++++++++++++++++++
 apps/openmw/mwworld/refdata.hpp | 12 ++++++-
 2 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index aed0b5ae0..bb470733c 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -3,10 +3,70 @@
 
 namespace MWWorld
 {
+    void RefData::copy (const RefData& refData)
+    {
+        mBaseNode = refData.mBaseNode;
+        mLocals = refData.mLocals;
+        mHasLocals = refData.mHasLocals;
+        mEnabled = refData.mEnabled;
+        mCount = refData.mCount;
+        mPosition = refData.mPosition;
+
+        mCreatureStats = refData.mCreatureStats;
+        mNpcStats = refData.mNpcStats;
+        mMovement = refData.mMovement;
+        mContainerStore = refData.mContainerStore;
+    }
+
+    void RefData::cleanup()
+    {
+        mBaseNode = 0;
+    }
+
     RefData::RefData (const ESMS::CellRef& cellRef)
     : mBaseNode(0), mHasLocals (false), mEnabled (true), mCount (1), mPosition (cellRef.pos)
     {}
 
+    RefData::RefData (const RefData& refData)
+    : mBaseNode(0)
+    {
+        try
+        {
+            copy (refData);
+        }
+        catch (...)
+        {
+            cleanup();
+            throw;
+        }
+    }
+
+    RefData::RefData& RefData::operator= (const RefData& refData)
+    {
+        try
+        {
+            cleanup();
+            copy (refData);
+        }
+        catch (...)
+        {
+            cleanup();
+            throw;
+        }
+
+        return *this;
+    }
+
+    RefData::~RefData()
+    {
+        try
+        {
+            cleanup();
+        }
+        catch (...)
+        {}
+    }
+
     std::string RefData::getHandle()
     {
         return mBaseNode->getName();
diff --git a/apps/openmw/mwworld/refdata.hpp b/apps/openmw/mwworld/refdata.hpp
index 7875c2e12..01f70f951 100644
--- a/apps/openmw/mwworld/refdata.hpp
+++ b/apps/openmw/mwworld/refdata.hpp
@@ -34,6 +34,8 @@ namespace MWWorld
             bool mEnabled;
             int mCount; // 0: deleted
 
+            ESM::Position mPosition;
+
             // we are using shared pointer here to avoid having to create custom copy-constructor,
             // assignment operator and destructor. As a consequence though copying a RefData object
             // manually will probably give unexcepted results. This is not a problem since RefData
@@ -44,7 +46,9 @@ namespace MWWorld
 
             boost::shared_ptr<ContainerStore<RefData> > mContainerStore;
 
-            ESM::Position mPosition;
+            void copy (const RefData& refData);
+
+            void cleanup();
 
         public:
 
@@ -53,6 +57,12 @@ namespace MWWorld
             /// to reset the position as the orignal data is still held in the CellRef
             RefData (const ESMS::CellRef& cellRef);
 
+            RefData (const RefData& refData);
+
+            ~RefData();
+
+            RefData& operator= (const RefData& refData);
+
             /// Return OGRE handle (may be empty).
             std::string getHandle();
 

From baf9cff21dccafaf1bdd55ce66bb1fe9b64752a6 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 24 Jan 2012 11:23:22 +0100
Subject: [PATCH 3/8] added customdata base class (issue #185)

---
 apps/openmw/CMakeLists.txt         |  2 +-
 apps/openmw/mwworld/customdata.hpp | 17 +++++++++++++++++
 apps/openmw/mwworld/refdata.cpp    | 23 +++++++++++++++++++++--
 apps/openmw/mwworld/refdata.hpp    | 11 +++++++++++
 4 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 apps/openmw/mwworld/customdata.hpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index c390f697a..e16cba9d6 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -46,7 +46,7 @@ add_openmw_dir (mwsound
 add_openmw_dir (mwworld
     refdata world physicssystem scene environment globals class action nullaction actionteleport
     containerstore actiontalk actiontake containerstore manualref containerutil player cellfunctors
-    cells localscripts
+    cells localscripts customdata
     )
 
 add_openmw_dir (mwclass
diff --git a/apps/openmw/mwworld/customdata.hpp b/apps/openmw/mwworld/customdata.hpp
new file mode 100644
index 000000000..588991fe4
--- /dev/null
+++ b/apps/openmw/mwworld/customdata.hpp
@@ -0,0 +1,17 @@
+#ifndef GAME_MWWORLD_CUSTOMDATA_H
+#define GAME_MWWORLD_CUSTOMDATA_H
+
+namespace MWWorld
+{
+    /// \brief Base class for the MW-class-specific part of RefData
+    class CustomData
+    {
+        public:
+
+            virtual ~CustomData() {}
+
+            virtual CustomData *clone() const = 0;
+    };
+}
+
+#endif
diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index bb470733c..359cd393e 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -1,6 +1,8 @@
 
 #include "refdata.hpp"
 
+#include "customdata.hpp"
+
 namespace MWWorld
 {
     void RefData::copy (const RefData& refData)
@@ -16,19 +18,25 @@ namespace MWWorld
         mNpcStats = refData.mNpcStats;
         mMovement = refData.mMovement;
         mContainerStore = refData.mContainerStore;
+
+        mCustomData = refData.mCustomData ? refData.mCustomData->clone() : 0;
     }
 
     void RefData::cleanup()
     {
         mBaseNode = 0;
+
+        delete mCustomData;
+        mCustomData = 0;
     }
 
     RefData::RefData (const ESMS::CellRef& cellRef)
-    : mBaseNode(0), mHasLocals (false), mEnabled (true), mCount (1), mPosition (cellRef.pos)
+    : mBaseNode(0), mHasLocals (false), mEnabled (true), mCount (1), mPosition (cellRef.pos),
+      mCustomData (0)
     {}
 
     RefData::RefData (const RefData& refData)
-    : mBaseNode(0)
+    : mBaseNode(0), mCustomData (0)
     {
         try
         {
@@ -145,4 +153,15 @@ namespace MWWorld
     {
         return mPosition;
     }
+
+    void RefData::setCustomData (CustomData *data)
+    {
+        delete mCustomData;
+        mCustomData = data;
+    }
+
+    CustomData *RefData::getCustomData()
+    {
+        return mCustomData;
+    }
 }
diff --git a/apps/openmw/mwworld/refdata.hpp b/apps/openmw/mwworld/refdata.hpp
index 01f70f951..c07432abd 100644
--- a/apps/openmw/mwworld/refdata.hpp
+++ b/apps/openmw/mwworld/refdata.hpp
@@ -22,6 +22,8 @@ namespace ESM
 
 namespace MWWorld
 {
+    class CustomData;
+
     class RefData
     {
             Ogre::SceneNode* mBaseNode;
@@ -36,6 +38,8 @@ namespace MWWorld
 
             ESM::Position mPosition;
 
+            CustomData *mCustomData;
+
             // we are using shared pointer here to avoid having to create custom copy-constructor,
             // assignment operator and destructor. As a consequence though copying a RefData object
             // manually will probably give unexcepted results. This is not a problem since RefData
@@ -95,6 +99,13 @@ namespace MWWorld
             boost::shared_ptr<ContainerStore<RefData> >& getContainerStore();
 
             ESM::Position& getPosition();
+
+            void setCustomData (CustomData *data);
+            ///< Set custom data (potentially replacing old custom data). The ownership of \æ data is
+            /// transferred to this.
+
+            CustomData *getCustomData();
+            ///< May return a 0-pointer. The ownership of the return data object is not transferred.
     };
 }
 

From c6761e347073355d4f8491044e68880be81399cb Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Wed, 25 Jan 2012 16:56:49 +0100
Subject: [PATCH 4/8] replaced NPC stats in ref data with new custom data
 implementation

---
 apps/openmw/mwclass/npc.cpp              | 58 ++++++++++++++++--------
 apps/openmw/mwclass/npc.hpp              |  4 +-
 apps/openmw/mwscript/statsextensions.cpp |  1 +
 apps/openmw/mwworld/refdata.cpp          |  6 ---
 apps/openmw/mwworld/refdata.hpp          |  4 --
 5 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 2b98a3d60..e48b95d01 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -1,6 +1,8 @@
 
 #include "npc.hpp"
 
+#include <memory>
+
 #include <components/esm/loadnpc.hpp>
 
 #include "../mwmechanics/creaturestats.hpp"
@@ -18,10 +20,44 @@ namespace
 {
     const Ogre::Radian kOgrePi (Ogre::Math::PI);
     const Ogre::Radian kOgrePiOverTwo (Ogre::Math::PI / Ogre::Real(2.0));
+
+    struct CustomData : public MWWorld::CustomData
+    {
+        MWMechanics::NpcStats mNpcStats;
+
+        virtual MWWorld::CustomData *clone() const;
+    };
+
+    MWWorld::CustomData *CustomData::clone() const
+    {
+        return new CustomData (*this);
+    }
 }
 
 namespace MWClass
 {
+    void Npc::ensureCustomData (const MWWorld::Ptr& ptr) const
+    {
+        if (!ptr.getRefData().getCustomData())
+        {
+            std::auto_ptr<CustomData> data (new CustomData);
+
+            ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData> *ref = ptr.get<ESM::NPC>();
+
+            if (!ref->base->faction.empty())
+            {
+                // TODO research how initial rank is stored. The information in loadnpc.hpp are at
+                // best very unclear.
+                data->mNpcStats.mFactionRank[ref->base->faction] = 0;
+            }
+
+            for (int i=0; i<27; ++i)
+                data->mNpcStats.mSkill[i].setBase (ref->base->npdt52.skills[i]);
+
+            ptr.getRefData().setCustomData (data.release());
+        }
+    }
+
     std::string Npc::getId (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData> *ref =
@@ -106,27 +142,9 @@ namespace MWClass
 
     MWMechanics::NpcStats& Npc::getNpcStats (const MWWorld::Ptr& ptr) const
     {
-        if (!ptr.getRefData().getNpcStats().get())
-        {
-            boost::shared_ptr<MWMechanics::NpcStats> stats (
-                new MWMechanics::NpcStats);
+        ensureCustomData (ptr);
 
-            ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData> *ref = ptr.get<ESM::NPC>();
-
-            if (!ref->base->faction.empty())
-            {
-                // TODO research how initial rank is stored. The information in loadnpc.hpp are at
-                // best very unclear.
-                stats->mFactionRank[ref->base->faction] = 0;
-            }
-
-            for (int i=0; i<27; ++i)
-                stats->mSkill[i].setBase (ref->base->npdt52.skills[i]);
-
-            ptr.getRefData().getNpcStats() = stats;
-        }
-
-        return *ptr.getRefData().getNpcStats();
+        return dynamic_cast<CustomData&> (*ptr.getRefData().getCustomData()).mNpcStats;
     }
 
     boost::shared_ptr<MWWorld::Action> Npc::activate (const MWWorld::Ptr& ptr,
diff --git a/apps/openmw/mwclass/npc.hpp b/apps/openmw/mwclass/npc.hpp
index cc9dbef7f..63f5c42dd 100644
--- a/apps/openmw/mwclass/npc.hpp
+++ b/apps/openmw/mwclass/npc.hpp
@@ -2,12 +2,14 @@
 #define GAME_MWCLASS_NPC_H
 
 #include "../mwworld/class.hpp"
-
+#include "../mwworld/customdata.hpp"
 
 namespace MWClass
 {
     class Npc : public MWWorld::Class
     {
+            void ensureCustomData (const MWWorld::Ptr& ptr) const;
+
         public:
 
             virtual std::string getId (const MWWorld::Ptr& ptr) const;
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index ca82830d9..0e97a39cf 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -10,6 +10,7 @@
 #include "../mwworld/class.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"
+#include "../mwmechanics/npcstats.hpp"
 
 #include "interpretercontext.hpp"
 #include "ref.hpp"
diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index 359cd393e..ce695e945 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -15,7 +15,6 @@ namespace MWWorld
         mPosition = refData.mPosition;
 
         mCreatureStats = refData.mCreatureStats;
-        mNpcStats = refData.mNpcStats;
         mMovement = refData.mMovement;
         mContainerStore = refData.mContainerStore;
 
@@ -134,11 +133,6 @@ namespace MWWorld
         return mCreatureStats;
     }
 
-    boost::shared_ptr<MWMechanics::NpcStats>& RefData::getNpcStats()
-    {
-        return mNpcStats;
-    }
-
     boost::shared_ptr<MWMechanics::Movement>& RefData::getMovement()
     {
         return mMovement;
diff --git a/apps/openmw/mwworld/refdata.hpp b/apps/openmw/mwworld/refdata.hpp
index c07432abd..ab7494343 100644
--- a/apps/openmw/mwworld/refdata.hpp
+++ b/apps/openmw/mwworld/refdata.hpp
@@ -10,7 +10,6 @@
 #include "../mwscript/locals.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"
-#include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/movement.hpp"
 
 #include "containerstore.hpp"
@@ -45,7 +44,6 @@ namespace MWWorld
             // manually will probably give unexcepted results. This is not a problem since RefData
             // are never copied outside of container operations.
             boost::shared_ptr<MWMechanics::CreatureStats> mCreatureStats;
-            boost::shared_ptr<MWMechanics::NpcStats> mNpcStats;
             boost::shared_ptr<MWMechanics::Movement> mMovement;
 
             boost::shared_ptr<ContainerStore<RefData> > mContainerStore;
@@ -92,8 +90,6 @@ namespace MWWorld
 
             boost::shared_ptr<MWMechanics::CreatureStats>& getCreatureStats();
 
-            boost::shared_ptr<MWMechanics::NpcStats>& getNpcStats();
-
             boost::shared_ptr<MWMechanics::Movement>& getMovement();
 
             boost::shared_ptr<ContainerStore<RefData> >& getContainerStore();

From aa87bd403059828293d2e2460a1e64203dbb70fc Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Thu, 26 Jan 2012 11:35:47 +0100
Subject: [PATCH 5/8] replaced creature stats in ref data with new custom data
 implementation

---
 apps/openmw/mwclass/creature.cpp | 77 ++++++++++++++++++++------------
 apps/openmw/mwclass/creature.hpp |  2 +
 apps/openmw/mwclass/npc.cpp      | 44 +++++++++---------
 apps/openmw/mwworld/refdata.cpp  |  6 ---
 apps/openmw/mwworld/refdata.hpp  |  4 --
 5 files changed, 71 insertions(+), 62 deletions(-)

diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 5aa203a49..ab0e6e7fa 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -8,12 +8,55 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontalk.hpp"
 #include "../mwworld/environment.hpp"
-
+#include "../mwworld/customdata.hpp"
 
 #include "../mwmechanics/mechanicsmanager.hpp"
 
+namespace
+{
+    struct CustomData : public MWWorld::CustomData
+    {
+        MWMechanics::CreatureStats mCreatureStats;
+
+        virtual MWWorld::CustomData *clone() const;
+    };
+
+    MWWorld::CustomData *CustomData::clone() const
+    {
+        return new CustomData (*this);
+    }
+}
+
 namespace MWClass
 {
+    void Creature::ensureCustomData (const MWWorld::Ptr& ptr) const
+    {
+        if (!ptr.getRefData().getCustomData())
+        {
+            std::auto_ptr<CustomData> data (new CustomData);
+
+            ESMS::LiveCellRef<ESM::Creature, MWWorld::RefData> *ref = ptr.get<ESM::Creature>();
+
+            // creature stats
+            data->mCreatureStats.mAttributes[0].set (ref->base->data.strength);
+            data->mCreatureStats.mAttributes[1].set (ref->base->data.intelligence);
+            data->mCreatureStats.mAttributes[2].set (ref->base->data.willpower);
+            data->mCreatureStats.mAttributes[3].set (ref->base->data.agility);
+            data->mCreatureStats.mAttributes[4].set (ref->base->data.speed);
+            data->mCreatureStats.mAttributes[5].set (ref->base->data.endurance);
+            data->mCreatureStats.mAttributes[6].set (ref->base->data.personality);
+            data->mCreatureStats.mAttributes[7].set (ref->base->data.luck);
+            data->mCreatureStats.mDynamic[0].set (ref->base->data.health);
+            data->mCreatureStats.mDynamic[1].set (ref->base->data.mana);
+            data->mCreatureStats.mDynamic[2].set (ref->base->data.fatigue);
+
+            data->mCreatureStats.mLevel = ref->base->data.level;
+
+            // store
+            ptr.getRefData().setCustomData (data.release());
+        }
+    }
+
     std::string Creature::getId (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Creature, MWWorld::RefData> *ref =
@@ -24,18 +67,18 @@ namespace MWClass
 
     void Creature::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) 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())
         {*/
             MWRender::Actors& actors = renderingInterface.getActors();
             actors.insertCreature(ptr);
-        
+
     }
 
     void Creature::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics, MWWorld::Environment& environment) const
@@ -72,31 +115,9 @@ namespace MWClass
 
     MWMechanics::CreatureStats& Creature::getCreatureStats (const MWWorld::Ptr& ptr) const
     {
-        if (!ptr.getRefData().getCreatureStats().get())
-        {
-            boost::shared_ptr<MWMechanics::CreatureStats> stats (
-                new MWMechanics::CreatureStats);
+        ensureCustomData (ptr);
 
-            ESMS::LiveCellRef<ESM::Creature, MWWorld::RefData> *ref = ptr.get<ESM::Creature>();
-
-            stats->mAttributes[0].set (ref->base->data.strength);
-            stats->mAttributes[1].set (ref->base->data.intelligence);
-            stats->mAttributes[2].set (ref->base->data.willpower);
-            stats->mAttributes[3].set (ref->base->data.agility);
-            stats->mAttributes[4].set (ref->base->data.speed);
-            stats->mAttributes[5].set (ref->base->data.endurance);
-            stats->mAttributes[6].set (ref->base->data.personality);
-            stats->mAttributes[7].set (ref->base->data.luck);
-            stats->mDynamic[0].set (ref->base->data.health);
-            stats->mDynamic[1].set (ref->base->data.mana);
-            stats->mDynamic[2].set (ref->base->data.fatigue);
-
-            stats->mLevel = ref->base->data.level;
-
-            ptr.getRefData().getCreatureStats() = stats;
-        }
-
-        return *ptr.getRefData().getCreatureStats();
+        return dynamic_cast<CustomData&> (*ptr.getRefData().getCustomData()).mCreatureStats;
     }
 
     boost::shared_ptr<MWWorld::Action> Creature::activate (const MWWorld::Ptr& ptr,
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index b7b654bc0..9afeffea8 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -10,6 +10,8 @@ namespace MWClass
 {
     class Creature : public MWWorld::Class
     {
+            void ensureCustomData (const MWWorld::Ptr& ptr) const;
+
         public:
 
             virtual std::string getId (const MWWorld::Ptr& ptr) const;
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index e48b95d01..963b53f60 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -24,6 +24,7 @@ namespace
     struct CustomData : public MWWorld::CustomData
     {
         MWMechanics::NpcStats mNpcStats;
+        MWMechanics::CreatureStats mCreatureStats;
 
         virtual MWWorld::CustomData *clone() const;
     };
@@ -44,6 +45,7 @@ namespace MWClass
 
             ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData> *ref = ptr.get<ESM::NPC>();
 
+            // NPC stats
             if (!ref->base->faction.empty())
             {
                 // TODO research how initial rank is stored. The information in loadnpc.hpp are at
@@ -54,6 +56,22 @@ namespace MWClass
             for (int i=0; i<27; ++i)
                 data->mNpcStats.mSkill[i].setBase (ref->base->npdt52.skills[i]);
 
+            // creature stats
+            data->mCreatureStats.mAttributes[0].set (ref->base->npdt52.strength);
+            data->mCreatureStats.mAttributes[1].set (ref->base->npdt52.intelligence);
+            data->mCreatureStats.mAttributes[2].set (ref->base->npdt52.willpower);
+            data->mCreatureStats.mAttributes[3].set (ref->base->npdt52.agility);
+            data->mCreatureStats.mAttributes[4].set (ref->base->npdt52.speed);
+            data->mCreatureStats.mAttributes[5].set (ref->base->npdt52.endurance);
+            data->mCreatureStats.mAttributes[6].set (ref->base->npdt52.personality);
+            data->mCreatureStats.mAttributes[7].set (ref->base->npdt52.luck);
+            data->mCreatureStats.mDynamic[0].set (ref->base->npdt52.health);
+            data->mCreatureStats.mDynamic[1].set (ref->base->npdt52.mana);
+            data->mCreatureStats.mDynamic[2].set (ref->base->npdt52.fatigue);
+
+            data->mCreatureStats.mLevel = ref->base->npdt52.level;
+
+            // store
             ptr.getRefData().setCustomData (data.release());
         }
     }
@@ -113,31 +131,9 @@ namespace MWClass
 
     MWMechanics::CreatureStats& Npc::getCreatureStats (const MWWorld::Ptr& ptr) const
     {
-        if (!ptr.getRefData().getCreatureStats().get())
-        {
-            boost::shared_ptr<MWMechanics::CreatureStats> stats (
-                new MWMechanics::CreatureStats);
+        ensureCustomData (ptr);
 
-            ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData> *ref = ptr.get<ESM::NPC>();
-
-            stats->mAttributes[0].set (ref->base->npdt52.strength);
-            stats->mAttributes[1].set (ref->base->npdt52.intelligence);
-            stats->mAttributes[2].set (ref->base->npdt52.willpower);
-            stats->mAttributes[3].set (ref->base->npdt52.agility);
-            stats->mAttributes[4].set (ref->base->npdt52.speed);
-            stats->mAttributes[5].set (ref->base->npdt52.endurance);
-            stats->mAttributes[6].set (ref->base->npdt52.personality);
-            stats->mAttributes[7].set (ref->base->npdt52.luck);
-            stats->mDynamic[0].set (ref->base->npdt52.health);
-            stats->mDynamic[1].set (ref->base->npdt52.mana);
-            stats->mDynamic[2].set (ref->base->npdt52.fatigue);
-
-            stats->mLevel = ref->base->npdt52.level;
-
-            ptr.getRefData().getCreatureStats() = stats;
-        }
-
-        return *ptr.getRefData().getCreatureStats();
+        return dynamic_cast<CustomData&> (*ptr.getRefData().getCustomData()).mCreatureStats;
     }
 
     MWMechanics::NpcStats& Npc::getNpcStats (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index ce695e945..2e4811367 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -14,7 +14,6 @@ namespace MWWorld
         mCount = refData.mCount;
         mPosition = refData.mPosition;
 
-        mCreatureStats = refData.mCreatureStats;
         mMovement = refData.mMovement;
         mContainerStore = refData.mContainerStore;
 
@@ -128,11 +127,6 @@ namespace MWWorld
         mEnabled = true;
     }
 
-    boost::shared_ptr<MWMechanics::CreatureStats>& RefData::getCreatureStats()
-    {
-        return mCreatureStats;
-    }
-
     boost::shared_ptr<MWMechanics::Movement>& RefData::getMovement()
     {
         return mMovement;
diff --git a/apps/openmw/mwworld/refdata.hpp b/apps/openmw/mwworld/refdata.hpp
index ab7494343..d6984afd9 100644
--- a/apps/openmw/mwworld/refdata.hpp
+++ b/apps/openmw/mwworld/refdata.hpp
@@ -9,7 +9,6 @@
 
 #include "../mwscript/locals.hpp"
 
-#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/movement.hpp"
 
 #include "containerstore.hpp"
@@ -43,7 +42,6 @@ namespace MWWorld
             // assignment operator and destructor. As a consequence though copying a RefData object
             // manually will probably give unexcepted results. This is not a problem since RefData
             // are never copied outside of container operations.
-            boost::shared_ptr<MWMechanics::CreatureStats> mCreatureStats;
             boost::shared_ptr<MWMechanics::Movement> mMovement;
 
             boost::shared_ptr<ContainerStore<RefData> > mContainerStore;
@@ -88,8 +86,6 @@ namespace MWWorld
 
             void disable();
 
-            boost::shared_ptr<MWMechanics::CreatureStats>& getCreatureStats();
-
             boost::shared_ptr<MWMechanics::Movement>& getMovement();
 
             boost::shared_ptr<ContainerStore<RefData> >& getContainerStore();

From b0256cea3456e22a2a562f4e03d975330cee3805 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 27 Jan 2012 13:17:30 +0100
Subject: [PATCH 6/8] replaced movement settings in ref data with new custom
 data implementation

---
 apps/openmw/mwclass/npc.cpp     | 26 ++++++++++----------------
 apps/openmw/mwworld/player.cpp  |  2 ++
 apps/openmw/mwworld/refdata.cpp |  6 ------
 apps/openmw/mwworld/refdata.hpp |  6 ------
 4 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 963b53f60..38db494e2 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -3,6 +3,8 @@
 
 #include <memory>
 
+#include <OgreSceneNode.h>
+
 #include <components/esm/loadnpc.hpp>
 
 #include "../mwmechanics/creaturestats.hpp"
@@ -12,9 +14,9 @@
 #include "../mwworld/actiontalk.hpp"
 #include "../mwworld/environment.hpp"
 #include "../mwworld/world.hpp"
+#include "../mwmechanics/movement.hpp"
 
 #include "../mwmechanics/mechanicsmanager.hpp"
-#include <OgreSceneNode.h>
 
 namespace
 {
@@ -25,6 +27,7 @@ namespace
     {
         MWMechanics::NpcStats mNpcStats;
         MWMechanics::CreatureStats mCreatureStats;
+        MWMechanics::Movement mMovement;
 
         virtual MWWorld::CustomData *clone() const;
     };
@@ -253,29 +256,20 @@ namespace MWClass
 
     MWMechanics::Movement& Npc::getMovementSettings (const MWWorld::Ptr& ptr) const
     {
-        if (!ptr.getRefData().getMovement().get())
-        {
-            boost::shared_ptr<MWMechanics::Movement> movement (
-                new MWMechanics::Movement);
+        ensureCustomData (ptr);
 
-            ptr.getRefData().getMovement() = movement;
-        }
-
-        return *ptr.getRefData().getMovement();
+        return dynamic_cast<CustomData&> (*ptr.getRefData().getCustomData()).mMovement;
     }
 
     Ogre::Vector3 Npc::getMovementVector (const MWWorld::Ptr& ptr) const
     {
         Ogre::Vector3 vector (0, 0, 0);
 
-        if (ptr.getRefData().getMovement().get())
-        {
-            vector.x = - ptr.getRefData().getMovement()->mLeftRight * 200;
-            vector.y = ptr.getRefData().getMovement()->mForwardBackward * 200;
+        vector.x = - getMovementSettings (ptr).mLeftRight * 200;
+        vector.y = getMovementSettings (ptr).mForwardBackward * 200;
 
-            if (getStance (ptr, Run, false))
-                vector *= 2;
-        }
+        if (getStance (ptr, Run, false))
+            vector *= 2;
 
         return vector;
     }
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index 4eb41ebf5..5bfb82138 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -3,6 +3,8 @@
 
 #include "../mwrender/player.hpp"
 
+#include "../mwmechanics/movement.hpp"
+
 #include "world.hpp"
 #include "class.hpp"
 
diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index 2e4811367..133440e0f 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -14,7 +14,6 @@ namespace MWWorld
         mCount = refData.mCount;
         mPosition = refData.mPosition;
 
-        mMovement = refData.mMovement;
         mContainerStore = refData.mContainerStore;
 
         mCustomData = refData.mCustomData ? refData.mCustomData->clone() : 0;
@@ -127,11 +126,6 @@ namespace MWWorld
         mEnabled = true;
     }
 
-    boost::shared_ptr<MWMechanics::Movement>& RefData::getMovement()
-    {
-        return mMovement;
-    }
-
     boost::shared_ptr<ContainerStore<RefData> >& RefData::getContainerStore()
     {
         return mContainerStore;
diff --git a/apps/openmw/mwworld/refdata.hpp b/apps/openmw/mwworld/refdata.hpp
index d6984afd9..075693533 100644
--- a/apps/openmw/mwworld/refdata.hpp
+++ b/apps/openmw/mwworld/refdata.hpp
@@ -9,8 +9,6 @@
 
 #include "../mwscript/locals.hpp"
 
-#include "../mwmechanics/movement.hpp"
-
 #include "containerstore.hpp"
 
 namespace ESM
@@ -42,8 +40,6 @@ namespace MWWorld
             // assignment operator and destructor. As a consequence though copying a RefData object
             // manually will probably give unexcepted results. This is not a problem since RefData
             // are never copied outside of container operations.
-            boost::shared_ptr<MWMechanics::Movement> mMovement;
-
             boost::shared_ptr<ContainerStore<RefData> > mContainerStore;
 
             void copy (const RefData& refData);
@@ -86,8 +82,6 @@ namespace MWWorld
 
             void disable();
 
-            boost::shared_ptr<MWMechanics::Movement>& getMovement();
-
             boost::shared_ptr<ContainerStore<RefData> >& getContainerStore();
 
             ESM::Position& getPosition();

From c081160591acde123942940a1b7a827832112347 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 27 Jan 2012 14:55:58 +0100
Subject: [PATCH 7/8] replaced container store in ref data with new custom data
 implementation

---
 apps/openmw/mwclass/container.cpp   | 44 +++++++++++++++++++++--------
 apps/openmw/mwclass/container.hpp   |  2 ++
 apps/openmw/mwclass/creature.cpp    | 34 ++++++----------------
 apps/openmw/mwclass/npc.cpp         | 21 ++++++--------
 apps/openmw/mwworld/ptr.hpp         |  2 ++
 apps/openmw/mwworld/refdata.cpp     | 11 ++------
 apps/openmw/mwworld/refdata.hpp     | 17 +++--------
 components/esm_store/cell_store.hpp |  5 ++--
 8 files changed, 63 insertions(+), 73 deletions(-)

diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 4157ce17a..f81e0b9db 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -6,9 +6,39 @@
 #include <components/esm_store/cell_store.hpp>
 
 #include "../mwworld/ptr.hpp"
+#include "../mwworld/containerstore.hpp"
+#include "../mwworld/customdata.hpp"
+
+namespace
+{
+    struct CustomData : public MWWorld::CustomData
+    {
+        MWWorld::ContainerStore<MWWorld::RefData> mContainerStore;
+
+        virtual MWWorld::CustomData *clone() const;
+    };
+
+    MWWorld::CustomData *CustomData::clone() const
+    {
+        return new CustomData (*this);
+    }
+}
 
 namespace MWClass
 {
+    void Container::ensureCustomData (const MWWorld::Ptr& ptr) const
+    {
+        if (!ptr.getRefData().getCustomData())
+        {
+            std::auto_ptr<CustomData> data (new CustomData);
+
+            // \todo add initial container content
+
+            // store
+            ptr.getRefData().setCustomData (data.release());
+        }
+    }
+
     void Container::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
         ESMS::LiveCellRef<ESM::Container, MWWorld::RefData> *ref =
@@ -16,7 +46,7 @@ namespace MWClass
 
         assert (ref->base != NULL);
         const std::string &model = ref->base->model;
-        
+
         if (!model.empty())
         {
             MWRender::Objects& objects = renderingInterface.getObjects();
@@ -50,17 +80,9 @@ namespace MWClass
     MWWorld::ContainerStore<MWWorld::RefData>& Container::getContainerStore (const MWWorld::Ptr& ptr)
         const
     {
-        if (!ptr.getRefData().getContainerStore().get())
-        {
-            boost::shared_ptr<MWWorld::ContainerStore<MWWorld::RefData> > store (
-                new MWWorld::ContainerStore<MWWorld::RefData>);
+        ensureCustomData (ptr);
 
-            // TODO add initial content
-
-            ptr.getRefData().getContainerStore() = store;
-        }
-
-        return *ptr.getRefData().getContainerStore();
+        return dynamic_cast<CustomData&> (*ptr.getRefData().getCustomData()).mContainerStore;
     }
 
     std::string Container::getScript (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwclass/container.hpp b/apps/openmw/mwclass/container.hpp
index 01763870a..9039d11ea 100644
--- a/apps/openmw/mwclass/container.hpp
+++ b/apps/openmw/mwclass/container.hpp
@@ -8,6 +8,8 @@ namespace MWClass
 {
     class Container : public MWWorld::Class
     {
+            void ensureCustomData (const MWWorld::Ptr& ptr) const;
+
         public:
 
             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index ab0e6e7fa..12a56e0ee 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -4,19 +4,20 @@
 #include <components/esm/loadcrea.hpp>
 
 #include "../mwmechanics/creaturestats.hpp"
+#include "../mwmechanics/mechanicsmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontalk.hpp"
 #include "../mwworld/environment.hpp"
 #include "../mwworld/customdata.hpp"
-
-#include "../mwmechanics/mechanicsmanager.hpp"
+#include "../mwworld/containerstore.hpp"
 
 namespace
 {
     struct CustomData : public MWWorld::CustomData
     {
         MWMechanics::CreatureStats mCreatureStats;
+        MWWorld::ContainerStore<MWWorld::RefData> mContainerStore;
 
         virtual MWWorld::CustomData *clone() const;
     };
@@ -52,6 +53,8 @@ namespace MWClass
 
             data->mCreatureStats.mLevel = ref->base->data.level;
 
+            // \todo add initial container content
+
             // store
             ptr.getRefData().setCustomData (data.release());
         }
@@ -67,18 +70,8 @@ namespace MWClass
 
     void Creature::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) 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())
-        {*/
-            MWRender::Actors& actors = renderingInterface.getActors();
-            actors.insertCreature(ptr);
-
+        MWRender::Actors& actors = renderingInterface.getActors();
+        actors.insertCreature(ptr);
     }
 
     void Creature::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics, MWWorld::Environment& environment) const
@@ -92,7 +85,6 @@ namespace MWClass
         if(!model.empty()){
             physics.insertActorPhysics(ptr, "meshes\\" + model);
         }
-
     }
 
     void Creature::enable (const MWWorld::Ptr& ptr, MWWorld::Environment& environment) const
@@ -129,17 +121,9 @@ namespace MWClass
     MWWorld::ContainerStore<MWWorld::RefData>& Creature::getContainerStore (const MWWorld::Ptr& ptr)
         const
     {
-        if (!ptr.getRefData().getContainerStore().get())
-        {
-            boost::shared_ptr<MWWorld::ContainerStore<MWWorld::RefData> > store (
-                new MWWorld::ContainerStore<MWWorld::RefData>);
+        ensureCustomData (ptr);
 
-            // TODO add initial content
-
-            ptr.getRefData().getContainerStore() = store;
-        }
-
-        return *ptr.getRefData().getContainerStore();
+        return dynamic_cast<CustomData&> (*ptr.getRefData().getCustomData()).mContainerStore;
     }
 
     std::string Creature::getScript (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 38db494e2..f3f5ca597 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -9,14 +9,14 @@
 
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"
+#include "../mwmechanics/movement.hpp"
+#include "../mwmechanics/mechanicsmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontalk.hpp"
 #include "../mwworld/environment.hpp"
 #include "../mwworld/world.hpp"
-#include "../mwmechanics/movement.hpp"
-
-#include "../mwmechanics/mechanicsmanager.hpp"
+#include "../mwworld/containerstore.hpp"
 
 namespace
 {
@@ -28,6 +28,7 @@ namespace
         MWMechanics::NpcStats mNpcStats;
         MWMechanics::CreatureStats mCreatureStats;
         MWMechanics::Movement mMovement;
+        MWWorld::ContainerStore<MWWorld::RefData> mContainerStore;
 
         virtual MWWorld::CustomData *clone() const;
     };
@@ -74,6 +75,8 @@ namespace MWClass
 
             data->mCreatureStats.mLevel = ref->base->npdt52.level;
 
+            // \todo add initial container content
+
             // store
             ptr.getRefData().setCustomData (data.release());
         }
@@ -155,17 +158,9 @@ namespace MWClass
     MWWorld::ContainerStore<MWWorld::RefData>& Npc::getContainerStore (const MWWorld::Ptr& ptr)
         const
     {
-        if (!ptr.getRefData().getContainerStore().get())
-        {
-            boost::shared_ptr<MWWorld::ContainerStore<MWWorld::RefData> > store (
-                new MWWorld::ContainerStore<MWWorld::RefData>);
+        ensureCustomData (ptr);
 
-            // TODO add initial content
-
-            ptr.getRefData().getContainerStore() = store;
-        }
-
-        return *ptr.getRefData().getContainerStore();
+        return dynamic_cast<CustomData&> (*ptr.getRefData().getCustomData()).mContainerStore;
     }
 
     std::string Npc::getScript (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwworld/ptr.hpp b/apps/openmw/mwworld/ptr.hpp
index 8bf75aa3c..389c9349d 100644
--- a/apps/openmw/mwworld/ptr.hpp
+++ b/apps/openmw/mwworld/ptr.hpp
@@ -5,6 +5,8 @@
 
 #include <boost/any.hpp>
 
+#include <components/esm/loadcell.hpp>
+
 #include <components/esm_store/cell_store.hpp>
 
 #include "refdata.hpp"
diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index 133440e0f..03d04a50e 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -1,6 +1,8 @@
 
 #include "refdata.hpp"
 
+#include <components/esm_store/cell_store.hpp>
+
 #include "customdata.hpp"
 
 namespace MWWorld
@@ -14,8 +16,6 @@ namespace MWWorld
         mCount = refData.mCount;
         mPosition = refData.mPosition;
 
-        mContainerStore = refData.mContainerStore;
-
         mCustomData = refData.mCustomData ? refData.mCustomData->clone() : 0;
     }
 
@@ -27,7 +27,7 @@ namespace MWWorld
         mCustomData = 0;
     }
 
-    RefData::RefData (const ESMS::CellRef& cellRef)
+    RefData::RefData (const ESM::CellRef& cellRef)
     : mBaseNode(0), mHasLocals (false), mEnabled (true), mCount (1), mPosition (cellRef.pos),
       mCustomData (0)
     {}
@@ -126,11 +126,6 @@ namespace MWWorld
         mEnabled = true;
     }
 
-    boost::shared_ptr<ContainerStore<RefData> >& RefData::getContainerStore()
-    {
-        return mContainerStore;
-    }
-
     ESM::Position& RefData::getPosition()
     {
         return mPosition;
diff --git a/apps/openmw/mwworld/refdata.hpp b/apps/openmw/mwworld/refdata.hpp
index 075693533..30d676f13 100644
--- a/apps/openmw/mwworld/refdata.hpp
+++ b/apps/openmw/mwworld/refdata.hpp
@@ -3,17 +3,16 @@
 
 #include <string>
 
-#include <boost/shared_ptr.hpp>
-
 #include <Ogre.h>
 
-#include "../mwscript/locals.hpp"
+#include <components/esm/defs.hpp>
 
-#include "containerstore.hpp"
+#include "../mwscript/locals.hpp"
 
 namespace ESM
 {
     class Script;
+    class CellRef;
 }
 
 namespace MWWorld
@@ -36,12 +35,6 @@ namespace MWWorld
 
             CustomData *mCustomData;
 
-            // we are using shared pointer here to avoid having to create custom copy-constructor,
-            // assignment operator and destructor. As a consequence though copying a RefData object
-            // manually will probably give unexcepted results. This is not a problem since RefData
-            // are never copied outside of container operations.
-            boost::shared_ptr<ContainerStore<RefData> > mContainerStore;
-
             void copy (const RefData& refData);
 
             void cleanup();
@@ -51,7 +44,7 @@ namespace MWWorld
             /// @param cellRef Used to copy constant data such as position into this class where it can
             /// be altered without effecting the original data. This makes it possible
             /// to reset the position as the orignal data is still held in the CellRef
-            RefData (const ESMS::CellRef& cellRef);
+            RefData (const ESM::CellRef& cellRef);
 
             RefData (const RefData& refData);
 
@@ -82,8 +75,6 @@ namespace MWWorld
 
             void disable();
 
-            boost::shared_ptr<ContainerStore<RefData> >& getContainerStore();
-
             ESM::Position& getPosition();
 
             void setCustomData (CustomData *data);
diff --git a/components/esm_store/cell_store.hpp b/components/esm_store/cell_store.hpp
index d064312f1..c4bcf84d8 100644
--- a/components/esm_store/cell_store.hpp
+++ b/components/esm_store/cell_store.hpp
@@ -12,7 +12,6 @@
 
 #include "store.hpp"
 #include "components/esm/records.hpp"
-#include "components/esm/loadcell.hpp"
 
 #include <list>
 #include <string>
@@ -36,7 +35,7 @@ namespace ESMS
   {
     LiveCellRef(const CellRef& cref, const X* b = NULL) : base(b), ref(cref),
                                                           mData(ref) {}
-                                                          
+
 
     LiveCellRef(const X* b = NULL) : base(b), mData(ref) {}
 
@@ -187,7 +186,7 @@ namespace ESMS
             ++iter)
             if (!functor (iter->ref, iter->mData))
                 return false;
-        
+
         return true;
     }
 

From 8de6761a794550613dfe524e8eefeb36b784eeec Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 27 Jan 2012 15:11:02 +0100
Subject: [PATCH 8/8] general cleanup

---
 apps/openmw/mwclass/apparatus.cpp  | 3 ++-
 apps/openmw/mwclass/apparatus.hpp  | 1 -
 apps/openmw/mwclass/armor.cpp      | 3 ++-
 apps/openmw/mwclass/armor.hpp      | 1 -
 apps/openmw/mwclass/book.cpp       | 3 ++-
 apps/openmw/mwclass/book.hpp       | 1 -
 apps/openmw/mwclass/clothing.cpp   | 3 ++-
 apps/openmw/mwclass/clothing.hpp   | 1 -
 apps/openmw/mwclass/container.cpp  | 2 ++
 apps/openmw/mwclass/container.hpp  | 1 -
 apps/openmw/mwclass/door.cpp       | 8 ++------
 apps/openmw/mwclass/door.hpp       | 1 -
 apps/openmw/mwclass/ingredient.cpp | 6 ++----
 apps/openmw/mwclass/ingredient.hpp | 1 -
 apps/openmw/mwclass/light.cpp      | 4 +++-
 apps/openmw/mwclass/light.hpp      | 1 -
 apps/openmw/mwclass/lockpick.cpp   | 4 +++-
 apps/openmw/mwclass/lockpick.hpp   | 1 -
 apps/openmw/mwclass/misc.cpp       | 4 +++-
 apps/openmw/mwclass/misc.hpp       | 1 -
 apps/openmw/mwclass/npc.cpp        | 1 +
 apps/openmw/mwclass/npc.hpp        | 1 -
 apps/openmw/mwclass/potion.cpp     | 3 ++-
 apps/openmw/mwclass/potion.hpp     | 1 -
 apps/openmw/mwclass/probe.hpp      | 1 -
 apps/openmw/mwclass/repair.cpp     | 4 +++-
 apps/openmw/mwclass/repair.hpp     | 1 -
 apps/openmw/mwclass/static.cpp     | 3 ++-
 apps/openmw/mwclass/static.hpp     | 1 -
 apps/openmw/mwclass/weapon.cpp     | 3 ++-
 apps/openmw/mwclass/weapon.hpp     | 1 -
 31 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index 30b308e70..cc30c6955 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -8,6 +8,7 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/objects.hpp"
 
 #include "containerutil.hpp"
 
@@ -20,7 +21,7 @@ namespace MWClass
 
         assert (ref->base != NULL);
         const std::string &model = ref->base->model;
-        
+
         if (!model.empty())
         {
             MWRender::Objects& objects = renderingInterface.getObjects();
diff --git a/apps/openmw/mwclass/apparatus.hpp b/apps/openmw/mwclass/apparatus.hpp
index 4c8a2c0e2..9a5a9b955 100644
--- a/apps/openmw/mwclass/apparatus.hpp
+++ b/apps/openmw/mwclass/apparatus.hpp
@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_APPARATUS_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index a8a431acf..9a0936027 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -8,6 +8,7 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/objects.hpp"
 
 #include "containerutil.hpp"
 
@@ -20,7 +21,7 @@ namespace MWClass
 
         assert (ref->base != NULL);
         const std::string &model = ref->base->model;
-        
+
         if (!model.empty())
         {
             MWRender::Objects& objects = renderingInterface.getObjects();
diff --git a/apps/openmw/mwclass/armor.hpp b/apps/openmw/mwclass/armor.hpp
index c5f9812b7..123713a38 100644
--- a/apps/openmw/mwclass/armor.hpp
+++ b/apps/openmw/mwclass/armor.hpp
@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_ARMOR_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index 011fd2c32..8c5be4793 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -8,6 +8,7 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/objects.hpp"
 
 #include "containerutil.hpp"
 
@@ -20,7 +21,7 @@ namespace MWClass
 
         assert (ref->base != NULL);
         const std::string &model = ref->base->model;
-        
+
         if (!model.empty())
         {
             MWRender::Objects& objects = renderingInterface.getObjects();
diff --git a/apps/openmw/mwclass/book.hpp b/apps/openmw/mwclass/book.hpp
index f0e38cceb..6e38ea0d3 100644
--- a/apps/openmw/mwclass/book.hpp
+++ b/apps/openmw/mwclass/book.hpp
@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_BOOK_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index 0214c72ad..3826c6c40 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -8,6 +8,7 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/objects.hpp"
 
 #include "containerutil.hpp"
 
@@ -20,7 +21,7 @@ namespace MWClass
 
         assert (ref->base != NULL);
         const std::string &model = ref->base->model;
-        
+
         if (!model.empty())
         {
             MWRender::Objects& objects = renderingInterface.getObjects();
diff --git a/apps/openmw/mwclass/clothing.hpp b/apps/openmw/mwclass/clothing.hpp
index 76c2c4a3e..353f7f606 100644
--- a/apps/openmw/mwclass/clothing.hpp
+++ b/apps/openmw/mwclass/clothing.hpp
@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_CLOTHING_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index f81e0b9db..13a6241d4 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -9,6 +9,8 @@
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/customdata.hpp"
 
+#include "../mwrender/objects.hpp"
+
 namespace
 {
     struct CustomData : public MWWorld::CustomData
diff --git a/apps/openmw/mwclass/container.hpp b/apps/openmw/mwclass/container.hpp
index 9039d11ea..78552ffe9 100644
--- a/apps/openmw/mwclass/container.hpp
+++ b/apps/openmw/mwclass/container.hpp
@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_CONTAINER_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 26436a012..d0b3b11a2 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -14,8 +14,6 @@
 
 #include "../mwrender/objects.hpp"
 
-#include <iostream>
-
 namespace MWClass
 {
     void Door::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
@@ -25,7 +23,7 @@ namespace MWClass
 
         assert (ref->base != NULL);
         const std::string &model = ref->base->model;
-        
+
         if (!model.empty())
         {
             MWRender::Objects& objects = renderingInterface.getObjects();
@@ -39,13 +37,11 @@ namespace MWClass
          ESMS::LiveCellRef<ESM::Door, MWWorld::RefData> *ref =
             ptr.get<ESM::Door>();
 
-
         const std::string &model = ref->base->model;
         assert (ref->base != NULL);
         if(!model.empty()){
             physics.insertObjectPhysics(ptr, "meshes\\" + model);
         }
-
     }
 
     std::string Door::getName (const MWWorld::Ptr& ptr) const
@@ -86,7 +82,7 @@ namespace MWClass
             }
             else
             {
-                // another NPC or a create is using the door
+                // another NPC or a creature is using the door
                 // TODO return action for teleporting other NPC/creature
                 return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction);
             }
diff --git a/apps/openmw/mwclass/door.hpp b/apps/openmw/mwclass/door.hpp
index c230cf357..aecb4224c 100644
--- a/apps/openmw/mwclass/door.hpp
+++ b/apps/openmw/mwclass/door.hpp
@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_DOOR_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index 5e55010eb..ac1076cc1 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -8,6 +8,7 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/objects.hpp"
 
 #include "containerutil.hpp"
 
@@ -20,7 +21,7 @@ namespace MWClass
 
         assert (ref->base != NULL);
         const std::string &model = ref->base->model;
-        
+
         if (!model.empty())
         {
             MWRender::Objects& objects = renderingInterface.getObjects();
@@ -34,14 +35,11 @@ namespace MWClass
         ESMS::LiveCellRef<ESM::Ingredient, MWWorld::RefData> *ref =
             ptr.get<ESM::Ingredient>();
 
-
-
         const std::string &model = ref->base->model;
         assert (ref->base != NULL);
         if(!model.empty()){
             physics.insertObjectPhysics(ptr, "meshes\\" + model);
         }
-
     }
 
     std::string Ingredient::getName (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwclass/ingredient.hpp b/apps/openmw/mwclass/ingredient.hpp
index 47bd1a9e5..6c7409665 100644
--- a/apps/openmw/mwclass/ingredient.hpp
+++ b/apps/openmw/mwclass/ingredient.hpp
@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_INGREDIENT_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index 3890899b0..2c50472ac 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -12,6 +12,8 @@
 
 #include "../mwsound/soundmanager.hpp"
 
+#include "../mwrender/objects.hpp"
+
 #include "containerutil.hpp"
 
 namespace MWClass
@@ -23,7 +25,7 @@ namespace MWClass
 
         assert (ref->base != NULL);
         const std::string &model = ref->base->model;
-        
+
         if (!model.empty())
         {
             MWRender::Objects& objects = renderingInterface.getObjects();
diff --git a/apps/openmw/mwclass/light.hpp b/apps/openmw/mwclass/light.hpp
index 34421ff51..7df82ae5d 100644
--- a/apps/openmw/mwclass/light.hpp
+++ b/apps/openmw/mwclass/light.hpp
@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_LIGHT_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index 636a8f0be..67756f23c 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -8,6 +8,8 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/objects.hpp"
+
 #include "containerutil.hpp"
 
 namespace MWClass
@@ -19,7 +21,7 @@ namespace MWClass
 
         assert (ref->base != NULL);
         const std::string &model = ref->base->model;
-        
+
         if (!model.empty())
         {
             MWRender::Objects& objects = renderingInterface.getObjects();
diff --git a/apps/openmw/mwclass/lockpick.hpp b/apps/openmw/mwclass/lockpick.hpp
index c5f1539b4..074a07c93 100644
--- a/apps/openmw/mwclass/lockpick.hpp
+++ b/apps/openmw/mwclass/lockpick.hpp
@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_LOCKPICK_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index a2642d8d5..81e018d96 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -8,6 +8,8 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/objects.hpp"
+
 #include "containerutil.hpp"
 
 namespace MWClass
@@ -19,7 +21,7 @@ namespace MWClass
 
         assert (ref->base != NULL);
         const std::string &model = ref->base->model;
-        
+
         if (!model.empty())
         {
             MWRender::Objects& objects = renderingInterface.getObjects();
diff --git a/apps/openmw/mwclass/misc.hpp b/apps/openmw/mwclass/misc.hpp
index 36ee2c1b2..cb1858315 100644
--- a/apps/openmw/mwclass/misc.hpp
+++ b/apps/openmw/mwclass/misc.hpp
@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_MISC_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index f3f5ca597..d94920041 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -17,6 +17,7 @@
 #include "../mwworld/environment.hpp"
 #include "../mwworld/world.hpp"
 #include "../mwworld/containerstore.hpp"
+#include "../mwworld/customdata.hpp"
 
 namespace
 {
diff --git a/apps/openmw/mwclass/npc.hpp b/apps/openmw/mwclass/npc.hpp
index 63f5c42dd..bb9b131c9 100644
--- a/apps/openmw/mwclass/npc.hpp
+++ b/apps/openmw/mwclass/npc.hpp
@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_NPC_H
 
 #include "../mwworld/class.hpp"
-#include "../mwworld/customdata.hpp"
 
 namespace MWClass
 {
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index 86d1e2a98..08047a2e8 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -8,6 +8,7 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/objects.hpp"
 
 #include "containerutil.hpp"
 
@@ -20,7 +21,7 @@ namespace MWClass
 
         assert (ref->base != NULL);
         const std::string &model = ref->base->model;
-        
+
         if (!model.empty())
         {
             MWRender::Objects& objects = renderingInterface.getObjects();
diff --git a/apps/openmw/mwclass/potion.hpp b/apps/openmw/mwclass/potion.hpp
index 85678121f..e1a54db3c 100644
--- a/apps/openmw/mwclass/potion.hpp
+++ b/apps/openmw/mwclass/potion.hpp
@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_POTION_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {
diff --git a/apps/openmw/mwclass/probe.hpp b/apps/openmw/mwclass/probe.hpp
index d7b9df738..287dd0475 100644
--- a/apps/openmw/mwclass/probe.hpp
+++ b/apps/openmw/mwclass/probe.hpp
@@ -3,7 +3,6 @@
 
 #include "../mwworld/class.hpp"
 
-
 namespace MWClass
 {
     class Probe : public MWWorld::Class
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index f8755b2eb..79c18d426 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -8,6 +8,8 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/objects.hpp"
+
 #include "containerutil.hpp"
 
 namespace MWClass
@@ -19,7 +21,7 @@ namespace MWClass
 
         assert (ref->base != NULL);
         const std::string &model = ref->base->model;
-        
+
         if (!model.empty())
         {
             MWRender::Objects& objects = renderingInterface.getObjects();
diff --git a/apps/openmw/mwclass/repair.hpp b/apps/openmw/mwclass/repair.hpp
index 1e0ea5178..174197d9a 100644
--- a/apps/openmw/mwclass/repair.hpp
+++ b/apps/openmw/mwclass/repair.hpp
@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_REPAIR_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {
diff --git a/apps/openmw/mwclass/static.cpp b/apps/openmw/mwclass/static.cpp
index 946da311d..fbd96182f 100644
--- a/apps/openmw/mwclass/static.cpp
+++ b/apps/openmw/mwclass/static.cpp
@@ -5,6 +5,7 @@
 
 #include "../mwworld/ptr.hpp"
 
+#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {
@@ -15,7 +16,7 @@ namespace MWClass
 
         assert (ref->base != NULL);
         const std::string &model = ref->base->model;
-        
+
         if (!model.empty())
         {
             MWRender::Objects& objects = renderingInterface.getObjects();
diff --git a/apps/openmw/mwclass/static.hpp b/apps/openmw/mwclass/static.hpp
index be3fdb180..a4b1d8c54 100644
--- a/apps/openmw/mwclass/static.hpp
+++ b/apps/openmw/mwclass/static.hpp
@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_STATIC_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index 1fbd21f7c..f136aaccd 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -8,6 +8,7 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 
+#include "../mwrender/objects.hpp"
 
 #include "containerutil.hpp"
 
@@ -20,7 +21,7 @@ namespace MWClass
 
         assert (ref->base != NULL);
         const std::string &model = ref->base->model;
-        
+
         if (!model.empty())
         {
             MWRender::Objects& objects = renderingInterface.getObjects();
diff --git a/apps/openmw/mwclass/weapon.hpp b/apps/openmw/mwclass/weapon.hpp
index 79bc4d4de..84c633ab3 100644
--- a/apps/openmw/mwclass/weapon.hpp
+++ b/apps/openmw/mwclass/weapon.hpp
@@ -2,7 +2,6 @@
 #define GAME_MWCLASS_WEAPON_H
 
 #include "../mwworld/class.hpp"
-#include "../mwrender/objects.hpp"
 
 namespace MWClass
 {