From 3aa53fea327b061af6208b99fcbe0cb8e39732ea Mon Sep 17 00:00:00 2001
From: greye <greye@null.net>
Date: Mon, 23 Jul 2012 23:06:53 +0400
Subject: [PATCH 01/20] wrong

---
 apps/openmw/mwworld/scene.cpp | 124 ----------------------------------
 1 file changed, 124 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 33c67aad8..b28a933b1 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -336,130 +336,6 @@ namespace MWWorld
 
 
     /// \todo this whole code needs major clean up, and doesn't belong in this class.
-    void Scene::insertObject (const Ptr& ptr, CellStore* cell)
-    {
-        std::string type = ptr.getTypeName();
-
-        MWWorld::Ptr newPtr;
-
-        // insert into the correct CellRefList
-        if      (type == typeid(ESM::Potion).name())
-        {
-            MWWorld::LiveCellRef<ESM::Potion>* ref = ptr.get<ESM::Potion>();
-            cell->potions.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->potions.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Apparatus).name())
-        {
-            MWWorld::LiveCellRef<ESM::Apparatus>* ref = ptr.get<ESM::Apparatus>();
-            cell->appas.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->appas.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Armor).name())
-        {
-            MWWorld::LiveCellRef<ESM::Armor>* ref = ptr.get<ESM::Armor>();
-            cell->armors.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->armors.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Book).name())
-        {
-            MWWorld::LiveCellRef<ESM::Book>* ref = ptr.get<ESM::Book>();
-            cell->books.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->books.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Clothing).name())
-        {
-            MWWorld::LiveCellRef<ESM::Clothing>* ref = ptr.get<ESM::Clothing>();
-            cell->clothes.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->clothes.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Ingredient).name())
-        {
-            MWWorld::LiveCellRef<ESM::Ingredient>* ref = ptr.get<ESM::Ingredient>();
-            cell->ingreds.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->ingreds.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Light).name())
-        {
-            MWWorld::LiveCellRef<ESM::Light>* ref = ptr.get<ESM::Light>();
-            cell->lights.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->lights.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Tool).name())
-        {
-            MWWorld::LiveCellRef<ESM::Tool>* ref = ptr.get<ESM::Tool>();
-            cell->lockpicks.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->lockpicks.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Repair).name())
-        {
-            MWWorld::LiveCellRef<ESM::Repair>* ref = ptr.get<ESM::Repair>();
-            cell->repairs.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->repairs.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Probe).name())
-        {
-            MWWorld::LiveCellRef<ESM::Probe>* ref = ptr.get<ESM::Probe>();
-            cell->probes.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->probes.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Weapon).name())
-        {
-            MWWorld::LiveCellRef<ESM::Weapon>* ref = ptr.get<ESM::Weapon>();
-            cell->weapons.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->weapons.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Miscellaneous).name())
-        {
-
-            // if this is gold, we need to fetch the correct mesh depending on the amount of gold.
-            if (MWWorld::Class::get(ptr).getName(ptr) == MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sGold")->str)
-            {
-                int goldAmount = ptr.getRefData().getCount();
-
-                std::string base = "Gold_001";
-                if (goldAmount >= 100)
-                    base = "Gold_100";
-                else if (goldAmount >= 25)
-                    base = "Gold_025";
-                else if (goldAmount >= 10)
-                    base = "Gold_010";
-                else if (goldAmount >= 5)
-                    base = "Gold_005";
-
-                MWWorld::ManualRef newRef (MWBase::Environment::get().getWorld()->getStore(), base);
-
-                MWWorld::LiveCellRef<ESM::Miscellaneous>* ref = newRef.getPtr().get<ESM::Miscellaneous>();
-
-                cell->miscItems.list.push_back( *ref );
-                newPtr = MWWorld::Ptr(&cell->miscItems.list.back(), cell);
-
-                ESM::Position& p = newPtr.getRefData().getPosition();
-                p.pos[0] = ptr.getRefData().getPosition().pos[0];
-                p.pos[1] = ptr.getRefData().getPosition().pos[1];
-                p.pos[2] = ptr.getRefData().getPosition().pos[2];
-            }
-            else
-            {
-                MWWorld::LiveCellRef<ESM::Miscellaneous>* ref = ptr.get<ESM::Miscellaneous>();
-
-                cell->miscItems.list.push_back( *ref );
-                newPtr = MWWorld::Ptr(&cell->miscItems.list.back(), cell);
-            }
-        }
-        else
-            throw std::runtime_error("Trying to insert object of unhandled type");
-
-
-
-        newPtr.getRefData().setCount(ptr.getRefData().getCount());
-        ptr.getRefData().setCount(0);
-        newPtr.getRefData().enable();
-
-        mRendering.addObject(newPtr);
-        MWWorld::Class::get(newPtr).insertObject(newPtr, *mPhysics);
-
-    }
 
     void Scene::addObjectToScene (const Ptr& ptr)
     {

From 9a2690f84921696f8894cdaf8b8ee5e2de9843d8 Mon Sep 17 00:00:00 2001
From: greye <greye@null.net>
Date: Mon, 23 Jul 2012 23:07:28 +0400
Subject: [PATCH 02/20] Revert "wrong"

This reverts commit 3aa53fea327b061af6208b99fcbe0cb8e39732ea.
---
 apps/openmw/mwworld/scene.cpp | 124 ++++++++++++++++++++++++++++++++++
 1 file changed, 124 insertions(+)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index b28a933b1..33c67aad8 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -336,6 +336,130 @@ namespace MWWorld
 
 
     /// \todo this whole code needs major clean up, and doesn't belong in this class.
+    void Scene::insertObject (const Ptr& ptr, CellStore* cell)
+    {
+        std::string type = ptr.getTypeName();
+
+        MWWorld::Ptr newPtr;
+
+        // insert into the correct CellRefList
+        if      (type == typeid(ESM::Potion).name())
+        {
+            MWWorld::LiveCellRef<ESM::Potion>* ref = ptr.get<ESM::Potion>();
+            cell->potions.list.push_back( *ref );
+            newPtr = MWWorld::Ptr(&cell->potions.list.back(), cell);
+        }
+        else if (type == typeid(ESM::Apparatus).name())
+        {
+            MWWorld::LiveCellRef<ESM::Apparatus>* ref = ptr.get<ESM::Apparatus>();
+            cell->appas.list.push_back( *ref );
+            newPtr = MWWorld::Ptr(&cell->appas.list.back(), cell);
+        }
+        else if (type == typeid(ESM::Armor).name())
+        {
+            MWWorld::LiveCellRef<ESM::Armor>* ref = ptr.get<ESM::Armor>();
+            cell->armors.list.push_back( *ref );
+            newPtr = MWWorld::Ptr(&cell->armors.list.back(), cell);
+        }
+        else if (type == typeid(ESM::Book).name())
+        {
+            MWWorld::LiveCellRef<ESM::Book>* ref = ptr.get<ESM::Book>();
+            cell->books.list.push_back( *ref );
+            newPtr = MWWorld::Ptr(&cell->books.list.back(), cell);
+        }
+        else if (type == typeid(ESM::Clothing).name())
+        {
+            MWWorld::LiveCellRef<ESM::Clothing>* ref = ptr.get<ESM::Clothing>();
+            cell->clothes.list.push_back( *ref );
+            newPtr = MWWorld::Ptr(&cell->clothes.list.back(), cell);
+        }
+        else if (type == typeid(ESM::Ingredient).name())
+        {
+            MWWorld::LiveCellRef<ESM::Ingredient>* ref = ptr.get<ESM::Ingredient>();
+            cell->ingreds.list.push_back( *ref );
+            newPtr = MWWorld::Ptr(&cell->ingreds.list.back(), cell);
+        }
+        else if (type == typeid(ESM::Light).name())
+        {
+            MWWorld::LiveCellRef<ESM::Light>* ref = ptr.get<ESM::Light>();
+            cell->lights.list.push_back( *ref );
+            newPtr = MWWorld::Ptr(&cell->lights.list.back(), cell);
+        }
+        else if (type == typeid(ESM::Tool).name())
+        {
+            MWWorld::LiveCellRef<ESM::Tool>* ref = ptr.get<ESM::Tool>();
+            cell->lockpicks.list.push_back( *ref );
+            newPtr = MWWorld::Ptr(&cell->lockpicks.list.back(), cell);
+        }
+        else if (type == typeid(ESM::Repair).name())
+        {
+            MWWorld::LiveCellRef<ESM::Repair>* ref = ptr.get<ESM::Repair>();
+            cell->repairs.list.push_back( *ref );
+            newPtr = MWWorld::Ptr(&cell->repairs.list.back(), cell);
+        }
+        else if (type == typeid(ESM::Probe).name())
+        {
+            MWWorld::LiveCellRef<ESM::Probe>* ref = ptr.get<ESM::Probe>();
+            cell->probes.list.push_back( *ref );
+            newPtr = MWWorld::Ptr(&cell->probes.list.back(), cell);
+        }
+        else if (type == typeid(ESM::Weapon).name())
+        {
+            MWWorld::LiveCellRef<ESM::Weapon>* ref = ptr.get<ESM::Weapon>();
+            cell->weapons.list.push_back( *ref );
+            newPtr = MWWorld::Ptr(&cell->weapons.list.back(), cell);
+        }
+        else if (type == typeid(ESM::Miscellaneous).name())
+        {
+
+            // if this is gold, we need to fetch the correct mesh depending on the amount of gold.
+            if (MWWorld::Class::get(ptr).getName(ptr) == MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sGold")->str)
+            {
+                int goldAmount = ptr.getRefData().getCount();
+
+                std::string base = "Gold_001";
+                if (goldAmount >= 100)
+                    base = "Gold_100";
+                else if (goldAmount >= 25)
+                    base = "Gold_025";
+                else if (goldAmount >= 10)
+                    base = "Gold_010";
+                else if (goldAmount >= 5)
+                    base = "Gold_005";
+
+                MWWorld::ManualRef newRef (MWBase::Environment::get().getWorld()->getStore(), base);
+
+                MWWorld::LiveCellRef<ESM::Miscellaneous>* ref = newRef.getPtr().get<ESM::Miscellaneous>();
+
+                cell->miscItems.list.push_back( *ref );
+                newPtr = MWWorld::Ptr(&cell->miscItems.list.back(), cell);
+
+                ESM::Position& p = newPtr.getRefData().getPosition();
+                p.pos[0] = ptr.getRefData().getPosition().pos[0];
+                p.pos[1] = ptr.getRefData().getPosition().pos[1];
+                p.pos[2] = ptr.getRefData().getPosition().pos[2];
+            }
+            else
+            {
+                MWWorld::LiveCellRef<ESM::Miscellaneous>* ref = ptr.get<ESM::Miscellaneous>();
+
+                cell->miscItems.list.push_back( *ref );
+                newPtr = MWWorld::Ptr(&cell->miscItems.list.back(), cell);
+            }
+        }
+        else
+            throw std::runtime_error("Trying to insert object of unhandled type");
+
+
+
+        newPtr.getRefData().setCount(ptr.getRefData().getCount());
+        ptr.getRefData().setCount(0);
+        newPtr.getRefData().enable();
+
+        mRendering.addObject(newPtr);
+        MWWorld::Class::get(newPtr).insertObject(newPtr, *mPhysics);
+
+    }
 
     void Scene::addObjectToScene (const Ptr& ptr)
     {

From d36d6aacf49741ccee9c6a6138f55b4123fd9b07 Mon Sep 17 00:00:00 2001
From: greye <greye@null.net>
Date: Mon, 23 Jul 2012 23:56:20 +0400
Subject: [PATCH 03/20] move Scene::insertObject to CellStore::insertObject,
 part 1

---
 apps/openmw/mwworld/cellstore.cpp | 107 +++++++++++++++++++++++++
 apps/openmw/mwworld/cellstore.hpp |   6 ++
 apps/openmw/mwworld/scene.cpp     | 126 ------------------------------
 3 files changed, 113 insertions(+), 126 deletions(-)

diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 60a7eb6e1..51a46ec3c 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -121,4 +121,111 @@ namespace MWWorld
             }
         }
     }
+
+    /// \todo this whole code needs major clean up
+    void CellStore::insertObject(const Ptr &ptr)
+    {
+        std::string type = ptr.getTypeName();
+
+        MWWorld::Ptr newPtr;
+
+        // insert into the correct CellRefList
+        if      (type == typeid(ESM::Potion).name())
+        {
+            MWWorld::LiveCellRef<ESM::Potion>* ref = ptr.get<ESM::Potion>();
+            newPtr = MWWorld::Ptr(&potions.insert(*ref), cell);
+        }
+        else if (type == typeid(ESM::Apparatus).name())
+        {
+            MWWorld::LiveCellRef<ESM::Apparatus>* ref = ptr.get<ESM::Apparatus>();
+            newPtr = MWWorld::Ptr(&appas.insert(*ref), cell);
+        }
+        else if (type == typeid(ESM::Armor).name())
+        {
+            MWWorld::LiveCellRef<ESM::Armor>* ref = ptr.get<ESM::Armor>();
+            newPtr = MWWorld::Ptr(&armors.insert(*ref), cell);
+        }
+        else if (type == typeid(ESM::Book).name())
+        {
+            MWWorld::LiveCellRef<ESM::Book>* ref = ptr.get<ESM::Book>();
+            newPtr = MWWorld::Ptr(&books.insert(*ref), cell);
+        }
+        else if (type == typeid(ESM::Clothing).name())
+        {
+            MWWorld::LiveCellRef<ESM::Clothing>* ref = ptr.get<ESM::Clothing>();
+            newPtr = MWWorld::Ptr(&clothes.insert(*ref), cell);
+        }
+        else if (type == typeid(ESM::Ingredient).name())
+        {
+            MWWorld::LiveCellRef<ESM::Ingredient>* ref = ptr.get<ESM::Ingredient>();
+            newPtr = MWWorld::Ptr(&ingreds.insert(*ref), cell);
+        }
+        else if (type == typeid(ESM::Light).name())
+        {
+            MWWorld::LiveCellRef<ESM::Light>* ref = ptr.get<ESM::Light>();
+            newPtr = MWWorld::Ptr(&lights.insert(*ref), cell);
+        }
+        else if (type == typeid(ESM::Tool).name())
+        {
+            MWWorld::LiveCellRef<ESM::Tool>* ref = ptr.get<ESM::Tool>();
+            newPtr = MWWorld::Ptr(&lockpicks.insert(*ref), cell);
+        }
+        else if (type == typeid(ESM::Repair).name())
+        {
+            MWWorld::LiveCellRef<ESM::Repair>* ref = ptr.get<ESM::Repair>();
+            newPtr = MWWorld::Ptr(&repairs.insert(*ref), cell);
+        }
+        else if (type == typeid(ESM::Probe).name())
+        {
+            MWWorld::LiveCellRef<ESM::Probe>* ref = ptr.get<ESM::Probe>();
+            newPtr = MWWorld::Ptr(&probes.insert(*ref), cell);
+        }
+        else if (type == typeid(ESM::Weapon).name())
+        {
+            MWWorld::LiveCellRef<ESM::Weapon>* ref = ptr.get<ESM::Weapon>();
+            newPtr = MWWorld::Ptr(&weapons.insert(*ref), cell);
+        }
+        else if (type == typeid(ESM::Miscellaneous).name())
+        {
+
+            // if this is gold, we need to fetch the correct mesh depending on the amount of gold.
+            if (MWWorld::Class::get(ptr).getName(ptr) == MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sGold")->str)
+            {
+                int goldAmount = ptr.getRefData().getCount();
+
+                std::string base = "Gold_001";
+                if (goldAmount >= 100)
+                    base = "Gold_100";
+                else if (goldAmount >= 25)
+                    base = "Gold_025";
+                else if (goldAmount >= 10)
+                    base = "Gold_010";
+                else if (goldAmount >= 5)
+                    base = "Gold_005";
+
+                MWWorld::ManualRef newRef (MWBase::Environment::get().getWorld()->getStore(), base);
+
+                MWWorld::LiveCellRef<ESM::Miscellaneous>* ref =
+                    newRef.getPtr().get<ESM::Miscellaneous>();
+
+                newPtr = MWWorld::Ptr(&miscItems.insert(*ref), cell);
+
+                ESM::Position& p = newPtr.getRefData().getPosition();
+                p.pos[0] = ptr.getRefData().getPosition().pos[0];
+                p.pos[1] = ptr.getRefData().getPosition().pos[1];
+                p.pos[2] = ptr.getRefData().getPosition().pos[2];
+            }
+            else
+            {
+                MWWorld::LiveCellRef<ESM::Miscellaneous>* ref = ptr.get<ESM::Miscellaneous>();
+                newPtr = MWWorld::Ptr(&miscItems.insert(*ref), cell);
+            }
+        }
+        else
+            throw std::runtime_error("Trying to insert object of unhandled type");
+
+        newPtr.getRefData().setCount(ptr.getRefData().getCount());
+        ptr.getRefData().setCount(0);
+        newPtr.getRefData().enable();
+    }
 }
diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index de3ac12ae..89724bca4 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -7,6 +7,7 @@
 #include <algorithm>
 
 #include "refdata.hpp"
+#include "ptr.hpp"
 
 namespace ESMS
 {
@@ -63,6 +64,11 @@ namespace MWWorld
       list.push_back(LiveRef(ref, obj));
     }
 
+    const LiveRef &insert(LiveRef &item) {
+        list.push_back(item);
+        return list.back();
+    }
+
     LiveRef *find (const std::string& name)
     {
         for (typename std::list<LiveRef>::iterator iter (list.begin()); iter!=list.end(); ++iter)
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 33c67aad8..d2725b00e 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -335,132 +335,6 @@ namespace MWWorld
     }
 
 
-    /// \todo this whole code needs major clean up, and doesn't belong in this class.
-    void Scene::insertObject (const Ptr& ptr, CellStore* cell)
-    {
-        std::string type = ptr.getTypeName();
-
-        MWWorld::Ptr newPtr;
-
-        // insert into the correct CellRefList
-        if      (type == typeid(ESM::Potion).name())
-        {
-            MWWorld::LiveCellRef<ESM::Potion>* ref = ptr.get<ESM::Potion>();
-            cell->potions.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->potions.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Apparatus).name())
-        {
-            MWWorld::LiveCellRef<ESM::Apparatus>* ref = ptr.get<ESM::Apparatus>();
-            cell->appas.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->appas.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Armor).name())
-        {
-            MWWorld::LiveCellRef<ESM::Armor>* ref = ptr.get<ESM::Armor>();
-            cell->armors.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->armors.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Book).name())
-        {
-            MWWorld::LiveCellRef<ESM::Book>* ref = ptr.get<ESM::Book>();
-            cell->books.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->books.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Clothing).name())
-        {
-            MWWorld::LiveCellRef<ESM::Clothing>* ref = ptr.get<ESM::Clothing>();
-            cell->clothes.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->clothes.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Ingredient).name())
-        {
-            MWWorld::LiveCellRef<ESM::Ingredient>* ref = ptr.get<ESM::Ingredient>();
-            cell->ingreds.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->ingreds.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Light).name())
-        {
-            MWWorld::LiveCellRef<ESM::Light>* ref = ptr.get<ESM::Light>();
-            cell->lights.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->lights.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Tool).name())
-        {
-            MWWorld::LiveCellRef<ESM::Tool>* ref = ptr.get<ESM::Tool>();
-            cell->lockpicks.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->lockpicks.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Repair).name())
-        {
-            MWWorld::LiveCellRef<ESM::Repair>* ref = ptr.get<ESM::Repair>();
-            cell->repairs.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->repairs.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Probe).name())
-        {
-            MWWorld::LiveCellRef<ESM::Probe>* ref = ptr.get<ESM::Probe>();
-            cell->probes.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->probes.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Weapon).name())
-        {
-            MWWorld::LiveCellRef<ESM::Weapon>* ref = ptr.get<ESM::Weapon>();
-            cell->weapons.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->weapons.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Miscellaneous).name())
-        {
-
-            // if this is gold, we need to fetch the correct mesh depending on the amount of gold.
-            if (MWWorld::Class::get(ptr).getName(ptr) == MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sGold")->str)
-            {
-                int goldAmount = ptr.getRefData().getCount();
-
-                std::string base = "Gold_001";
-                if (goldAmount >= 100)
-                    base = "Gold_100";
-                else if (goldAmount >= 25)
-                    base = "Gold_025";
-                else if (goldAmount >= 10)
-                    base = "Gold_010";
-                else if (goldAmount >= 5)
-                    base = "Gold_005";
-
-                MWWorld::ManualRef newRef (MWBase::Environment::get().getWorld()->getStore(), base);
-
-                MWWorld::LiveCellRef<ESM::Miscellaneous>* ref = newRef.getPtr().get<ESM::Miscellaneous>();
-
-                cell->miscItems.list.push_back( *ref );
-                newPtr = MWWorld::Ptr(&cell->miscItems.list.back(), cell);
-
-                ESM::Position& p = newPtr.getRefData().getPosition();
-                p.pos[0] = ptr.getRefData().getPosition().pos[0];
-                p.pos[1] = ptr.getRefData().getPosition().pos[1];
-                p.pos[2] = ptr.getRefData().getPosition().pos[2];
-            }
-            else
-            {
-                MWWorld::LiveCellRef<ESM::Miscellaneous>* ref = ptr.get<ESM::Miscellaneous>();
-
-                cell->miscItems.list.push_back( *ref );
-                newPtr = MWWorld::Ptr(&cell->miscItems.list.back(), cell);
-            }
-        }
-        else
-            throw std::runtime_error("Trying to insert object of unhandled type");
-
-
-
-        newPtr.getRefData().setCount(ptr.getRefData().getCount());
-        ptr.getRefData().setCount(0);
-        newPtr.getRefData().enable();
-
-        mRendering.addObject(newPtr);
-        MWWorld::Class::get(newPtr).insertObject(newPtr, *mPhysics);
-
-    }
-
     void Scene::addObjectToScene (const Ptr& ptr)
     {
         mRendering.addObject (ptr);

From b76022517935b7d5e16f34100143c0beec3fa253 Mon Sep 17 00:00:00 2001
From: greye <greye@null.net>
Date: Tue, 24 Jul 2012 00:00:10 +0400
Subject: [PATCH 04/20] wrong branch

This reverts commit d36d6aacf49741ccee9c6a6138f55b4123fd9b07.
---
 apps/openmw/mwworld/cellstore.cpp | 107 -------------------------
 apps/openmw/mwworld/cellstore.hpp |   6 --
 apps/openmw/mwworld/scene.cpp     | 126 ++++++++++++++++++++++++++++++
 3 files changed, 126 insertions(+), 113 deletions(-)

diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 51a46ec3c..60a7eb6e1 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -121,111 +121,4 @@ namespace MWWorld
             }
         }
     }
-
-    /// \todo this whole code needs major clean up
-    void CellStore::insertObject(const Ptr &ptr)
-    {
-        std::string type = ptr.getTypeName();
-
-        MWWorld::Ptr newPtr;
-
-        // insert into the correct CellRefList
-        if      (type == typeid(ESM::Potion).name())
-        {
-            MWWorld::LiveCellRef<ESM::Potion>* ref = ptr.get<ESM::Potion>();
-            newPtr = MWWorld::Ptr(&potions.insert(*ref), cell);
-        }
-        else if (type == typeid(ESM::Apparatus).name())
-        {
-            MWWorld::LiveCellRef<ESM::Apparatus>* ref = ptr.get<ESM::Apparatus>();
-            newPtr = MWWorld::Ptr(&appas.insert(*ref), cell);
-        }
-        else if (type == typeid(ESM::Armor).name())
-        {
-            MWWorld::LiveCellRef<ESM::Armor>* ref = ptr.get<ESM::Armor>();
-            newPtr = MWWorld::Ptr(&armors.insert(*ref), cell);
-        }
-        else if (type == typeid(ESM::Book).name())
-        {
-            MWWorld::LiveCellRef<ESM::Book>* ref = ptr.get<ESM::Book>();
-            newPtr = MWWorld::Ptr(&books.insert(*ref), cell);
-        }
-        else if (type == typeid(ESM::Clothing).name())
-        {
-            MWWorld::LiveCellRef<ESM::Clothing>* ref = ptr.get<ESM::Clothing>();
-            newPtr = MWWorld::Ptr(&clothes.insert(*ref), cell);
-        }
-        else if (type == typeid(ESM::Ingredient).name())
-        {
-            MWWorld::LiveCellRef<ESM::Ingredient>* ref = ptr.get<ESM::Ingredient>();
-            newPtr = MWWorld::Ptr(&ingreds.insert(*ref), cell);
-        }
-        else if (type == typeid(ESM::Light).name())
-        {
-            MWWorld::LiveCellRef<ESM::Light>* ref = ptr.get<ESM::Light>();
-            newPtr = MWWorld::Ptr(&lights.insert(*ref), cell);
-        }
-        else if (type == typeid(ESM::Tool).name())
-        {
-            MWWorld::LiveCellRef<ESM::Tool>* ref = ptr.get<ESM::Tool>();
-            newPtr = MWWorld::Ptr(&lockpicks.insert(*ref), cell);
-        }
-        else if (type == typeid(ESM::Repair).name())
-        {
-            MWWorld::LiveCellRef<ESM::Repair>* ref = ptr.get<ESM::Repair>();
-            newPtr = MWWorld::Ptr(&repairs.insert(*ref), cell);
-        }
-        else if (type == typeid(ESM::Probe).name())
-        {
-            MWWorld::LiveCellRef<ESM::Probe>* ref = ptr.get<ESM::Probe>();
-            newPtr = MWWorld::Ptr(&probes.insert(*ref), cell);
-        }
-        else if (type == typeid(ESM::Weapon).name())
-        {
-            MWWorld::LiveCellRef<ESM::Weapon>* ref = ptr.get<ESM::Weapon>();
-            newPtr = MWWorld::Ptr(&weapons.insert(*ref), cell);
-        }
-        else if (type == typeid(ESM::Miscellaneous).name())
-        {
-
-            // if this is gold, we need to fetch the correct mesh depending on the amount of gold.
-            if (MWWorld::Class::get(ptr).getName(ptr) == MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sGold")->str)
-            {
-                int goldAmount = ptr.getRefData().getCount();
-
-                std::string base = "Gold_001";
-                if (goldAmount >= 100)
-                    base = "Gold_100";
-                else if (goldAmount >= 25)
-                    base = "Gold_025";
-                else if (goldAmount >= 10)
-                    base = "Gold_010";
-                else if (goldAmount >= 5)
-                    base = "Gold_005";
-
-                MWWorld::ManualRef newRef (MWBase::Environment::get().getWorld()->getStore(), base);
-
-                MWWorld::LiveCellRef<ESM::Miscellaneous>* ref =
-                    newRef.getPtr().get<ESM::Miscellaneous>();
-
-                newPtr = MWWorld::Ptr(&miscItems.insert(*ref), cell);
-
-                ESM::Position& p = newPtr.getRefData().getPosition();
-                p.pos[0] = ptr.getRefData().getPosition().pos[0];
-                p.pos[1] = ptr.getRefData().getPosition().pos[1];
-                p.pos[2] = ptr.getRefData().getPosition().pos[2];
-            }
-            else
-            {
-                MWWorld::LiveCellRef<ESM::Miscellaneous>* ref = ptr.get<ESM::Miscellaneous>();
-                newPtr = MWWorld::Ptr(&miscItems.insert(*ref), cell);
-            }
-        }
-        else
-            throw std::runtime_error("Trying to insert object of unhandled type");
-
-        newPtr.getRefData().setCount(ptr.getRefData().getCount());
-        ptr.getRefData().setCount(0);
-        newPtr.getRefData().enable();
-    }
 }
diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index 89724bca4..de3ac12ae 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -7,7 +7,6 @@
 #include <algorithm>
 
 #include "refdata.hpp"
-#include "ptr.hpp"
 
 namespace ESMS
 {
@@ -64,11 +63,6 @@ namespace MWWorld
       list.push_back(LiveRef(ref, obj));
     }
 
-    const LiveRef &insert(LiveRef &item) {
-        list.push_back(item);
-        return list.back();
-    }
-
     LiveRef *find (const std::string& name)
     {
         for (typename std::list<LiveRef>::iterator iter (list.begin()); iter!=list.end(); ++iter)
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index d2725b00e..33c67aad8 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -335,6 +335,132 @@ namespace MWWorld
     }
 
 
+    /// \todo this whole code needs major clean up, and doesn't belong in this class.
+    void Scene::insertObject (const Ptr& ptr, CellStore* cell)
+    {
+        std::string type = ptr.getTypeName();
+
+        MWWorld::Ptr newPtr;
+
+        // insert into the correct CellRefList
+        if      (type == typeid(ESM::Potion).name())
+        {
+            MWWorld::LiveCellRef<ESM::Potion>* ref = ptr.get<ESM::Potion>();
+            cell->potions.list.push_back( *ref );
+            newPtr = MWWorld::Ptr(&cell->potions.list.back(), cell);
+        }
+        else if (type == typeid(ESM::Apparatus).name())
+        {
+            MWWorld::LiveCellRef<ESM::Apparatus>* ref = ptr.get<ESM::Apparatus>();
+            cell->appas.list.push_back( *ref );
+            newPtr = MWWorld::Ptr(&cell->appas.list.back(), cell);
+        }
+        else if (type == typeid(ESM::Armor).name())
+        {
+            MWWorld::LiveCellRef<ESM::Armor>* ref = ptr.get<ESM::Armor>();
+            cell->armors.list.push_back( *ref );
+            newPtr = MWWorld::Ptr(&cell->armors.list.back(), cell);
+        }
+        else if (type == typeid(ESM::Book).name())
+        {
+            MWWorld::LiveCellRef<ESM::Book>* ref = ptr.get<ESM::Book>();
+            cell->books.list.push_back( *ref );
+            newPtr = MWWorld::Ptr(&cell->books.list.back(), cell);
+        }
+        else if (type == typeid(ESM::Clothing).name())
+        {
+            MWWorld::LiveCellRef<ESM::Clothing>* ref = ptr.get<ESM::Clothing>();
+            cell->clothes.list.push_back( *ref );
+            newPtr = MWWorld::Ptr(&cell->clothes.list.back(), cell);
+        }
+        else if (type == typeid(ESM::Ingredient).name())
+        {
+            MWWorld::LiveCellRef<ESM::Ingredient>* ref = ptr.get<ESM::Ingredient>();
+            cell->ingreds.list.push_back( *ref );
+            newPtr = MWWorld::Ptr(&cell->ingreds.list.back(), cell);
+        }
+        else if (type == typeid(ESM::Light).name())
+        {
+            MWWorld::LiveCellRef<ESM::Light>* ref = ptr.get<ESM::Light>();
+            cell->lights.list.push_back( *ref );
+            newPtr = MWWorld::Ptr(&cell->lights.list.back(), cell);
+        }
+        else if (type == typeid(ESM::Tool).name())
+        {
+            MWWorld::LiveCellRef<ESM::Tool>* ref = ptr.get<ESM::Tool>();
+            cell->lockpicks.list.push_back( *ref );
+            newPtr = MWWorld::Ptr(&cell->lockpicks.list.back(), cell);
+        }
+        else if (type == typeid(ESM::Repair).name())
+        {
+            MWWorld::LiveCellRef<ESM::Repair>* ref = ptr.get<ESM::Repair>();
+            cell->repairs.list.push_back( *ref );
+            newPtr = MWWorld::Ptr(&cell->repairs.list.back(), cell);
+        }
+        else if (type == typeid(ESM::Probe).name())
+        {
+            MWWorld::LiveCellRef<ESM::Probe>* ref = ptr.get<ESM::Probe>();
+            cell->probes.list.push_back( *ref );
+            newPtr = MWWorld::Ptr(&cell->probes.list.back(), cell);
+        }
+        else if (type == typeid(ESM::Weapon).name())
+        {
+            MWWorld::LiveCellRef<ESM::Weapon>* ref = ptr.get<ESM::Weapon>();
+            cell->weapons.list.push_back( *ref );
+            newPtr = MWWorld::Ptr(&cell->weapons.list.back(), cell);
+        }
+        else if (type == typeid(ESM::Miscellaneous).name())
+        {
+
+            // if this is gold, we need to fetch the correct mesh depending on the amount of gold.
+            if (MWWorld::Class::get(ptr).getName(ptr) == MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sGold")->str)
+            {
+                int goldAmount = ptr.getRefData().getCount();
+
+                std::string base = "Gold_001";
+                if (goldAmount >= 100)
+                    base = "Gold_100";
+                else if (goldAmount >= 25)
+                    base = "Gold_025";
+                else if (goldAmount >= 10)
+                    base = "Gold_010";
+                else if (goldAmount >= 5)
+                    base = "Gold_005";
+
+                MWWorld::ManualRef newRef (MWBase::Environment::get().getWorld()->getStore(), base);
+
+                MWWorld::LiveCellRef<ESM::Miscellaneous>* ref = newRef.getPtr().get<ESM::Miscellaneous>();
+
+                cell->miscItems.list.push_back( *ref );
+                newPtr = MWWorld::Ptr(&cell->miscItems.list.back(), cell);
+
+                ESM::Position& p = newPtr.getRefData().getPosition();
+                p.pos[0] = ptr.getRefData().getPosition().pos[0];
+                p.pos[1] = ptr.getRefData().getPosition().pos[1];
+                p.pos[2] = ptr.getRefData().getPosition().pos[2];
+            }
+            else
+            {
+                MWWorld::LiveCellRef<ESM::Miscellaneous>* ref = ptr.get<ESM::Miscellaneous>();
+
+                cell->miscItems.list.push_back( *ref );
+                newPtr = MWWorld::Ptr(&cell->miscItems.list.back(), cell);
+            }
+        }
+        else
+            throw std::runtime_error("Trying to insert object of unhandled type");
+
+
+
+        newPtr.getRefData().setCount(ptr.getRefData().getCount());
+        ptr.getRefData().setCount(0);
+        newPtr.getRefData().enable();
+
+        mRendering.addObject(newPtr);
+        MWWorld::Class::get(newPtr).insertObject(newPtr, *mPhysics);
+
+    }
+
     void Scene::addObjectToScene (const Ptr& ptr)
     {
         mRendering.addObject (ptr);

From 61cb012ee7dd1f356af408bccc1ed9a59b2461af Mon Sep 17 00:00:00 2001
From: greye <greye@null.net>
Date: Tue, 24 Jul 2012 11:15:20 +0400
Subject: [PATCH 05/20] moving Scene::insertObject to CellStore::insertObject,
 part 1

---
 apps/openmw/mwworld/cellstore.cpp | 116 ++++++++++++++++++++++++++-
 apps/openmw/mwworld/cellstore.hpp |   9 +++
 apps/openmw/mwworld/scene.cpp     | 129 ------------------------------
 apps/openmw/mwworld/scene.hpp     |   4 -
 apps/openmw/mwworld/worldimp.cpp  |   3 +-
 5 files changed, 126 insertions(+), 135 deletions(-)

diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 60a7eb6e1..22c94cf75 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -1,10 +1,12 @@
-
 #include "cellstore.hpp"
 
 #include <iostream>
 
 #include <components/esm_store/store.hpp>
 
+#include "ptr.hpp"
+#include "manualref.hpp"
+
 namespace MWWorld
 {
     CellStore::CellStore (const ESM::Cell *cell_) : cell (cell_), mState (State_Unloaded)
@@ -121,4 +123,116 @@ namespace MWWorld
             }
         }
     }
+
+    /// \todo this whole code needs major clean up
+    void CellStore::insertObject (const Ptr& ptr)
+    {
+        std::string type = ptr.getTypeName();
+
+        MWWorld::Ptr newPtr;
+
+        // insert into the correct CellRefList
+        if      (type == typeid(ESM::Potion).name())
+        {
+            MWWorld::LiveCellRef<ESM::Potion>* ref = ptr.get<ESM::Potion>();
+            newPtr = MWWorld::Ptr(&potions.insert(*ref), this);
+        }
+        else if (type == typeid(ESM::Apparatus).name())
+        {
+            MWWorld::LiveCellRef<ESM::Apparatus>* ref = ptr.get<ESM::Apparatus>();
+            newPtr = MWWorld::Ptr(&appas.insert(*ref), this);
+        }
+        else if (type == typeid(ESM::Armor).name())
+        {
+            MWWorld::LiveCellRef<ESM::Armor>* ref = ptr.get<ESM::Armor>();
+            newPtr = MWWorld::Ptr(&armors.insert(*ref), this);
+        }
+        else if (type == typeid(ESM::Book).name())
+        {
+            MWWorld::LiveCellRef<ESM::Book>* ref = ptr.get<ESM::Book>();
+            newPtr = MWWorld::Ptr(&books.insert(*ref), this);
+        }
+        else if (type == typeid(ESM::Clothing).name())
+        {
+            MWWorld::LiveCellRef<ESM::Clothing>* ref = ptr.get<ESM::Clothing>();
+            newPtr = MWWorld::Ptr(&clothes.insert(*ref), this);
+        }
+        else if (type == typeid(ESM::Ingredient).name())
+        {
+            MWWorld::LiveCellRef<ESM::Ingredient>* ref = ptr.get<ESM::Ingredient>();
+            newPtr = MWWorld::Ptr(&ingreds.insert(*ref), this);
+        }
+        else if (type == typeid(ESM::Light).name())
+        {
+            MWWorld::LiveCellRef<ESM::Light>* ref = ptr.get<ESM::Light>();
+            newPtr = MWWorld::Ptr(&lights.insert(*ref), this);
+        }
+        else if (type == typeid(ESM::Tool).name())
+        {
+            MWWorld::LiveCellRef<ESM::Tool>* ref = ptr.get<ESM::Tool>();
+            newPtr = MWWorld::Ptr(&lockpicks.insert(*ref), this);
+        }
+        else if (type == typeid(ESM::Repair).name())
+        {
+            MWWorld::LiveCellRef<ESM::Repair>* ref = ptr.get<ESM::Repair>();
+            newPtr = MWWorld::Ptr(&repairs.insert(*ref), this);
+        }
+        else if (type == typeid(ESM::Probe).name())
+        {
+            MWWorld::LiveCellRef<ESM::Probe>* ref = ptr.get<ESM::Probe>();
+            newPtr = MWWorld::Ptr(&probes.insert(*ref), this);
+        }
+        else if (type == typeid(ESM::Weapon).name())
+        {
+            MWWorld::LiveCellRef<ESM::Weapon>* ref = ptr.get<ESM::Weapon>();
+            newPtr = MWWorld::Ptr(&weapons.insert(*ref), this);
+        }
+        else if (type == typeid(ESM::Miscellaneous).name())
+        {
+
+            // if this is gold, we need to fetch the correct mesh depending on the amount of gold.
+            if (MWWorld::Class::get(ptr).getName(ptr) == MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sGold")->str)
+            {
+                int goldAmount = ptr.getRefData().getCount();
+
+                std::string base = "Gold_001";
+                if (goldAmount >= 100)
+                    base = "Gold_100";
+                else if (goldAmount >= 25)
+                    base = "Gold_025";
+                else if (goldAmount >= 10)
+                    base = "Gold_010";
+                else if (goldAmount >= 5)
+                    base = "Gold_005";
+
+                MWWorld::ManualRef newRef(
+                    MWBase::Environment::get().getWorld()->getStore(),
+                    base);
+
+                MWWorld::LiveCellRef<ESM::Miscellaneous>* ref =
+                    newRef.getPtr().get<ESM::Miscellaneous>();
+
+                newPtr = MWWorld::Ptr(&miscItems.insert(*ref), this);
+
+                ESM::Position& p = newPtr.getRefData().getPosition();
+                p.pos[0] = ptr.getRefData().getPosition().pos[0];
+                p.pos[1] = ptr.getRefData().getPosition().pos[1];
+                p.pos[2] = ptr.getRefData().getPosition().pos[2];
+            }
+            else
+            {
+                MWWorld::LiveCellRef<ESM::Miscellaneous>* ref =
+                    ptr.get<ESM::Miscellaneous>();
+
+                newPtr = MWWorld::Ptr(&miscItems.insert(*ref), this);
+            }
+        }
+        else
+            throw std::runtime_error("Trying to insert object of unhandled type");
+
+        newPtr.getRefData().setCount(ptr.getRefData().getCount());
+        ptr.getRefData().setCount(0);
+        newPtr.getRefData().enable();
+    }
+
 }
diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index de3ac12ae..3dcde9359 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -15,6 +15,8 @@ namespace ESMS
 
 namespace MWWorld
 {
+    class Ptr;
+
   /// A reference to one object (of any type) in a cell.
   ///
   /// Constructing this with a CellRef instance in the constructor means that
@@ -73,6 +75,11 @@ namespace MWWorld
 
         return 0;
     }
+
+    LiveRef &insert(const LiveRef &item) {
+        list.push_back(item);
+        return list.back();
+    }
   };
 
   /// A storage struct for one single cell reference.
@@ -165,6 +172,8 @@ namespace MWWorld
     void listRefs(const ESMS::ESMStore &store, ESM::ESMReader &esm);
 
     void loadRefs(const ESMS::ESMStore &store, ESM::ESMReader &esm);
+
+    void insertObject(const MWWorld::Ptr &ptr);
   };
 }
 
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 33c67aad8..9786c24d9 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -9,8 +9,6 @@
 
 #include "../mwgui/window_manager.hpp"
 
-#include "../mwworld/manualref.hpp" /// FIXME
-
 #include "player.hpp"
 #include "localscripts.hpp"
 
@@ -334,133 +332,6 @@ namespace MWWorld
         insertCellRefList(mRendering, cell.weapons, cell, *mPhysics);
     }
 
-
-    /// \todo this whole code needs major clean up, and doesn't belong in this class.
-    void Scene::insertObject (const Ptr& ptr, CellStore* cell)
-    {
-        std::string type = ptr.getTypeName();
-
-        MWWorld::Ptr newPtr;
-
-        // insert into the correct CellRefList
-        if      (type == typeid(ESM::Potion).name())
-        {
-            MWWorld::LiveCellRef<ESM::Potion>* ref = ptr.get<ESM::Potion>();
-            cell->potions.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->potions.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Apparatus).name())
-        {
-            MWWorld::LiveCellRef<ESM::Apparatus>* ref = ptr.get<ESM::Apparatus>();
-            cell->appas.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->appas.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Armor).name())
-        {
-            MWWorld::LiveCellRef<ESM::Armor>* ref = ptr.get<ESM::Armor>();
-            cell->armors.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->armors.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Book).name())
-        {
-            MWWorld::LiveCellRef<ESM::Book>* ref = ptr.get<ESM::Book>();
-            cell->books.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->books.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Clothing).name())
-        {
-            MWWorld::LiveCellRef<ESM::Clothing>* ref = ptr.get<ESM::Clothing>();
-            cell->clothes.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->clothes.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Ingredient).name())
-        {
-            MWWorld::LiveCellRef<ESM::Ingredient>* ref = ptr.get<ESM::Ingredient>();
-            cell->ingreds.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->ingreds.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Light).name())
-        {
-            MWWorld::LiveCellRef<ESM::Light>* ref = ptr.get<ESM::Light>();
-            cell->lights.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->lights.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Tool).name())
-        {
-            MWWorld::LiveCellRef<ESM::Tool>* ref = ptr.get<ESM::Tool>();
-            cell->lockpicks.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->lockpicks.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Repair).name())
-        {
-            MWWorld::LiveCellRef<ESM::Repair>* ref = ptr.get<ESM::Repair>();
-            cell->repairs.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->repairs.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Probe).name())
-        {
-            MWWorld::LiveCellRef<ESM::Probe>* ref = ptr.get<ESM::Probe>();
-            cell->probes.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->probes.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Weapon).name())
-        {
-            MWWorld::LiveCellRef<ESM::Weapon>* ref = ptr.get<ESM::Weapon>();
-            cell->weapons.list.push_back( *ref );
-            newPtr = MWWorld::Ptr(&cell->weapons.list.back(), cell);
-        }
-        else if (type == typeid(ESM::Miscellaneous).name())
-        {
-
-            // if this is gold, we need to fetch the correct mesh depending on the amount of gold.
-            if (MWWorld::Class::get(ptr).getName(ptr) == MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sGold")->str)
-            {
-                int goldAmount = ptr.getRefData().getCount();
-
-                std::string base = "Gold_001";
-                if (goldAmount >= 100)
-                    base = "Gold_100";
-                else if (goldAmount >= 25)
-                    base = "Gold_025";
-                else if (goldAmount >= 10)
-                    base = "Gold_010";
-                else if (goldAmount >= 5)
-                    base = "Gold_005";
-
-                MWWorld::ManualRef newRef (MWBase::Environment::get().getWorld()->getStore(), base);
-
-                MWWorld::LiveCellRef<ESM::Miscellaneous>* ref = newRef.getPtr().get<ESM::Miscellaneous>();
-
-                cell->miscItems.list.push_back( *ref );
-                newPtr = MWWorld::Ptr(&cell->miscItems.list.back(), cell);
-
-                ESM::Position& p = newPtr.getRefData().getPosition();
-                p.pos[0] = ptr.getRefData().getPosition().pos[0];
-                p.pos[1] = ptr.getRefData().getPosition().pos[1];
-                p.pos[2] = ptr.getRefData().getPosition().pos[2];
-            }
-            else
-            {
-                MWWorld::LiveCellRef<ESM::Miscellaneous>* ref = ptr.get<ESM::Miscellaneous>();
-
-                cell->miscItems.list.push_back( *ref );
-                newPtr = MWWorld::Ptr(&cell->miscItems.list.back(), cell);
-            }
-        }
-        else
-            throw std::runtime_error("Trying to insert object of unhandled type");
-
-
-
-        newPtr.getRefData().setCount(ptr.getRefData().getCount());
-        ptr.getRefData().setCount(0);
-        newPtr.getRefData().enable();
-
-        mRendering.addObject(newPtr);
-        MWWorld::Class::get(newPtr).insertObject(newPtr, *mPhysics);
-
-    }
-
     void Scene::addObjectToScene (const Ptr& ptr)
     {
         mRendering.addObject (ptr);
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index c0b93796a..f5f4b640b 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -88,10 +88,6 @@ namespace MWWorld
 
             void insertCell (Ptr::CellStore &cell);
 
-            /// this method is only meant for dropping objects into the gameworld from a container
-            /// and thus only handles object types that can be placed in a container
-            void insertObject (const Ptr& object, CellStore* cell);
-
             void update (float duration);
 
             void addObjectToScene (const Ptr& ptr);
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index a68f08e34..4ffcd33f8 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1021,7 +1021,8 @@ namespace MWWorld
         pos.pos[1] = -result.second[2];
         pos.pos[2] = result.second[1];
 
-        mWorldScene->insertObject(object, cell);
+        cell->insertObject(object);
+        //TODO mWorldScene->addObjectToScene
 
         /// \todo retrieve the bounds of the object and translate it accordingly
 

From 71253c64ab8f11205fef1dc191be78275ff80937 Mon Sep 17 00:00:00 2001
From: greye <greye@null.net>
Date: Tue, 24 Jul 2012 12:30:59 +0400
Subject: [PATCH 06/20] moving part 2, adding position parameter, stable

---
 apps/openmw/mwworld/cellstore.cpp | 13 +++++++++++--
 apps/openmw/mwworld/cellstore.hpp |  4 ++--
 apps/openmw/mwworld/worldimp.cpp  | 16 +++++++---------
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 22c94cf75..088c0c623 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -4,8 +4,12 @@
 
 #include <components/esm_store/store.hpp>
 
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+
 #include "ptr.hpp"
 #include "manualref.hpp"
+#include "class.hpp"
 
 namespace MWWorld
 {
@@ -125,7 +129,7 @@ namespace MWWorld
     }
 
     /// \todo this whole code needs major clean up
-    void CellStore::insertObject (const Ptr& ptr)
+    const MWWorld::Ptr CellStore::insertObject (const Ptr& ptr, const ESM::Position &pos)
     {
         std::string type = ptr.getTypeName();
 
@@ -213,11 +217,12 @@ namespace MWWorld
                     newRef.getPtr().get<ESM::Miscellaneous>();
 
                 newPtr = MWWorld::Ptr(&miscItems.insert(*ref), this);
-
+            /*
                 ESM::Position& p = newPtr.getRefData().getPosition();
                 p.pos[0] = ptr.getRefData().getPosition().pos[0];
                 p.pos[1] = ptr.getRefData().getPosition().pos[1];
                 p.pos[2] = ptr.getRefData().getPosition().pos[2];
+            */
             }
             else
             {
@@ -230,9 +235,13 @@ namespace MWWorld
         else
             throw std::runtime_error("Trying to insert object of unhandled type");
 
+        newPtr.getRefData().getPosition() = pos;
+
         newPtr.getRefData().setCount(ptr.getRefData().getCount());
         ptr.getRefData().setCount(0);
         newPtr.getRefData().enable();
+
+        return newPtr;
     }
 
 }
diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index 3dcde9359..1bf233a50 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -155,6 +155,8 @@ namespace MWWorld
             forEachImp (functor, weapons);
     }
 
+    const MWWorld::Ptr insertObject(const MWWorld::Ptr &ptr, const ESM::Position &pos);
+
   private:
 
     template<class Functor, class List>
@@ -172,8 +174,6 @@ namespace MWWorld
     void listRefs(const ESMS::ESMStore &store, ESM::ESMReader &esm);
 
     void loadRefs(const ESMS::ESMStore &store, ESM::ESMReader &esm);
-
-    void insertObject(const MWWorld::Ptr &ptr);
   };
 }
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 4ffcd33f8..efb17a709 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1016,13 +1016,13 @@ namespace MWWorld
         else
             cell = getPlayer().getPlayer().getCell();
 
-        ESM::Position& pos = object.getRefData().getPosition();
+        ESM::Position pos = getPlayer().getPlayer().getRefData().getPosition();
         pos.pos[0] = result.second[0];
         pos.pos[1] = -result.second[2];
         pos.pos[2] = result.second[1];
 
-        cell->insertObject(object);
-        //TODO mWorldScene->addObjectToScene
+        MWWorld::Ptr dropped = cell->insertObject(object, pos);
+        mWorldScene->addObjectToScene(dropped);
 
         /// \todo retrieve the bounds of the object and translate it accordingly
 
@@ -1044,14 +1044,12 @@ namespace MWWorld
     {
         MWWorld::Ptr::CellStore* cell = getPlayer().getPlayer().getCell();
 
-        float* playerPos = getPlayer().getPlayer().getRefData().getPosition().pos;
+        ESM::Position &pos =
+            getPlayer().getPlayer().getRefData().getPosition();
 
-        ESM::Position& pos = object.getRefData().getPosition();
-        pos.pos[0] = playerPos[0];
-        pos.pos[1] = playerPos[1];
-        pos.pos[2] = playerPos[2];
+        MWWorld::Ptr dropped = cell->insertObject(object, pos);
 
-        mWorldScene->insertObject(object, cell);
+        mWorldScene->addObjectToScene(dropped);
     }
 
     void World::processChangedSettings(const Settings::CategorySettingVector& settings)

From 87050e48c8d757afe2c1fe9819c06bb9c7d978e6 Mon Sep 17 00:00:00 2001
From: greye <greye@null.net>
Date: Tue, 24 Jul 2012 18:52:08 +0400
Subject: [PATCH 07/20] physics getObjectHeight(), MWWorld::Class::getModel()
 definition

---
 apps/openmw/mwworld/class.cpp         |  5 +++++
 apps/openmw/mwworld/class.hpp         |  2 ++
 apps/openmw/mwworld/physicssystem.cpp | 10 ++++++++++
 apps/openmw/mwworld/physicssystem.hpp |  2 ++
 libs/openengine/bullet/physic.cpp     | 21 +++++++++++++++++++++
 libs/openengine/bullet/physic.hpp     |  2 ++
 6 files changed, 42 insertions(+)

diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 65fa91666..f973301c5 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -212,4 +212,9 @@ namespace MWWorld
     void Class::adjustRotation(const MWWorld::Ptr& ptr,float& x,float& y,float& z) const
     {
     }
+
+    std::string Class::getModel() const
+    {
+        return "";
+    }
 }
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 3d3ed71ec..5f16ef593 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -204,6 +204,8 @@ namespace MWWorld
             virtual void adjustScale(const MWWorld::Ptr& ptr,float& scale) const;
 
             virtual void adjustRotation(const MWWorld::Ptr& ptr,float& x,float& y,float& z) const;
+
+            virtual std::string getModel() const;
     };
 }
 
diff --git a/apps/openmw/mwworld/physicssystem.cpp b/apps/openmw/mwworld/physicssystem.cpp
index bf5c001db..db1db0505 100644
--- a/apps/openmw/mwworld/physicssystem.cpp
+++ b/apps/openmw/mwworld/physicssystem.cpp
@@ -14,6 +14,7 @@
 #include "../mwbase/world.hpp" // FIXME
 
 #include "ptr.hpp"
+#include "class.hpp"
 
 using namespace Ogre;
 namespace MWWorld
@@ -365,4 +366,13 @@ namespace MWWorld
          addActor (node->getName(), model, node->getPosition());
      }
 
+     float PhysicsSystem::getObjectHeight(const MWWorld::Ptr &ptr) {
+        std::string model = MWWorld::Class::get(ptr).getModel();
+        if (model.empty()) {
+            return 0.0;
+        }
+        float scale = ptr.getRefData().getBaseNode()->getScale().x;
+        return mEngine->getObjectHeight(model, scale);
+     }
+
 }
diff --git a/apps/openmw/mwworld/physicssystem.hpp b/apps/openmw/mwworld/physicssystem.hpp
index a6b679833..61e2590bd 100644
--- a/apps/openmw/mwworld/physicssystem.hpp
+++ b/apps/openmw/mwworld/physicssystem.hpp
@@ -65,6 +65,8 @@ namespace MWWorld
 
             void setCurrentWater(bool hasWater, int waterHeight);
 
+            float getObjectHeight(const MWWorld::Ptr &ptr);
+
         private:
             OEngine::Render::OgreRenderer &mRender;
             OEngine::Physic::PhysicEngine* mEngine;
diff --git a/libs/openengine/bullet/physic.cpp b/libs/openengine/bullet/physic.cpp
index 61d0c7b0e..416d0c09d 100644
--- a/libs/openengine/bullet/physic.cpp
+++ b/libs/openengine/bullet/physic.cpp
@@ -568,4 +568,25 @@ namespace Physic
 
         return results2;
     }
+
+    float PhysicEngine::getObjectHeight(const std::string &mesh, float scale) {
+        char uniqueID[8];
+        sprintf( uniqueID, "%07.3f", scale );
+        std::string sid = uniqueID;
+        std::string outputstring = mesh + uniqueID + "\"|";
+
+        mShapeLoader->load(outputstring, "General");
+        BulletShapeManager::getSingletonPtr()->load(outputstring, "General");
+        BulletShapePtr shape =
+            BulletShapeManager::getSingleton().getByName(outputstring, "General");
+
+        
+        btTransform trans;
+        btVector3 min, max;
+
+        trans.setIdentity();
+        shape->Shape->getAabb(trans, min, max);
+
+        return max.z() - min.z();
+    }
 }};
diff --git a/libs/openengine/bullet/physic.hpp b/libs/openengine/bullet/physic.hpp
index 3988c75a4..22c5fa274 100644
--- a/libs/openengine/bullet/physic.hpp
+++ b/libs/openengine/bullet/physic.hpp
@@ -221,6 +221,8 @@ namespace Physic
 
         bool toggleDebugRendering();
 
+        float getObjectHeight(const std::string &mesh, float scale);
+
         /**
          * Return the closest object hit by a ray. If there are no objects, it will return ("",-1).
          */

From 6a3a728a56f76d2a74277f1b52b77355c649b3e0 Mon Sep 17 00:00:00 2001
From: greye <greye@null.net>
Date: Tue, 24 Jul 2012 20:22:11 +0400
Subject: [PATCH 08/20] Class::getModel implementation

---
 apps/openmw/mwclass/activator.cpp     | 29 +++++++++++++------------
 apps/openmw/mwclass/activator.hpp     |  2 ++
 apps/openmw/mwclass/apparatus.cpp     | 31 ++++++++++++++-------------
 apps/openmw/mwclass/apparatus.hpp     |  2 ++
 apps/openmw/mwclass/armor.cpp         | 28 +++++++++++++-----------
 apps/openmw/mwclass/armor.hpp         |  1 +
 apps/openmw/mwclass/book.cpp          | 29 +++++++++++++------------
 apps/openmw/mwclass/book.hpp          |  2 ++
 apps/openmw/mwclass/clothing.cpp      | 29 +++++++++++++------------
 apps/openmw/mwclass/clothing.hpp      |  2 ++
 apps/openmw/mwclass/container.cpp     | 29 +++++++++++++------------
 apps/openmw/mwclass/container.hpp     |  2 ++
 apps/openmw/mwclass/creature.cpp      | 18 +++++++++++-----
 apps/openmw/mwclass/creature.hpp      |  2 ++
 apps/openmw/mwclass/door.cpp          | 29 ++++++++++++++-----------
 apps/openmw/mwclass/door.hpp          |  2 ++
 apps/openmw/mwclass/ingredient.cpp    | 27 ++++++++++++-----------
 apps/openmw/mwclass/ingredient.hpp    |  2 ++
 apps/openmw/mwclass/light.cpp         | 25 +++++++++++++++------
 apps/openmw/mwclass/light.hpp         |  2 ++
 apps/openmw/mwclass/lockpick.cpp      | 30 +++++++++++++-------------
 apps/openmw/mwclass/lockpick.hpp      |  2 ++
 apps/openmw/mwclass/misc.cpp          | 29 +++++++++++++------------
 apps/openmw/mwclass/misc.hpp          |  2 ++
 apps/openmw/mwclass/npc.cpp           | 30 +++++++++++++++-----------
 apps/openmw/mwclass/npc.hpp           |  2 ++
 apps/openmw/mwclass/potion.cpp        | 29 +++++++++++++------------
 apps/openmw/mwclass/potion.hpp        |  2 ++
 apps/openmw/mwclass/probe.cpp         | 30 +++++++++++++-------------
 apps/openmw/mwclass/probe.hpp         |  2 ++
 apps/openmw/mwclass/repair.cpp        | 29 +++++++++++++------------
 apps/openmw/mwclass/repair.hpp        |  2 ++
 apps/openmw/mwclass/static.cpp        | 28 +++++++++++++-----------
 apps/openmw/mwclass/static.hpp        |  2 ++
 apps/openmw/mwclass/weapon.cpp        | 29 +++++++++++++------------
 apps/openmw/mwclass/weapon.hpp        |  1 +
 apps/openmw/mwworld/class.cpp         |  2 +-
 apps/openmw/mwworld/class.hpp         |  2 +-
 apps/openmw/mwworld/physicssystem.cpp |  3 +--
 39 files changed, 312 insertions(+), 237 deletions(-)

diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index 81a47ccb0..33baad7ca 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -19,32 +19,33 @@ namespace MWClass
 {
    void Activator::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        MWWorld::LiveCellRef<ESM::Activator> *ref =
-            ptr.get<ESM::Activator>();
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
+        const std::string model = getModel(ptr);
+        if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Activator::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
+    {
+        const std::string model = getModel(ptr);
+        if(!model.empty()) {
+            physics.insertObjectPhysics(ptr, model);
+        }
+    }
+    
+    std::string Activator::getModel(const MWWorld::Ptr &ptr) const
     {
         MWWorld::LiveCellRef<ESM::Activator> *ref =
             ptr.get<ESM::Activator>();
-
+        assert(ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
-        if(!model.empty()){
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
+        if (!model.empty()) {
+            return "meshes\\" + model;
         }
-
+        return "";
     }
 
     std::string Activator::getName (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwclass/activator.hpp b/apps/openmw/mwclass/activator.hpp
index 223dd0a36..2e947a9fc 100644
--- a/apps/openmw/mwclass/activator.hpp
+++ b/apps/openmw/mwclass/activator.hpp
@@ -28,6 +28,8 @@ namespace MWClass
             ///< Return name of the script attached to ptr
 
             static void registerSelf();
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 
diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index 7e3c3b8f9..dd255f9f8 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -22,34 +22,35 @@
 
 namespace MWClass
 {
-   void Apparatus::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
+    void Apparatus::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        MWWorld::LiveCellRef<ESM::Apparatus> *ref =
-            ptr.get<ESM::Apparatus>();
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
+        const std::string model = getModel(ptr);
+        if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Apparatus::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
+    {
+        const std::string model = getModel(ptr);
+        if(!model.empty()) {
+            physics.insertObjectPhysics(ptr, model);
+        }
+    }
+    
+    std::string Apparatus::getModel(const MWWorld::Ptr &ptr) const
     {
         MWWorld::LiveCellRef<ESM::Apparatus> *ref =
             ptr.get<ESM::Apparatus>();
-
+        assert(ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
-        if(!model.empty()){
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
+        if (!model.empty()) {
+            return "meshes\\" + model;
         }
-
+        return "";
     }
 
     std::string Apparatus::getName (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwclass/apparatus.hpp b/apps/openmw/mwclass/apparatus.hpp
index f33f92e2c..fa77eec93 100644
--- a/apps/openmw/mwclass/apparatus.hpp
+++ b/apps/openmw/mwclass/apparatus.hpp
@@ -48,6 +48,8 @@ namespace MWClass
             virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)
                 const;
             ///< Generate action for using via inventory menu
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index 380c596d7..8bbb198cc 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -27,31 +27,33 @@ namespace MWClass
 {
     void Armor::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        MWWorld::LiveCellRef<ESM::Armor> *ref =
-            ptr.get<ESM::Armor>();
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
+        const std::string model = getModel(ptr);
+        if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Armor::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
+    {
+        const std::string model = getModel(ptr);
+        if(!model.empty()) {
+            physics.insertObjectPhysics(ptr, model);
+        }
+    }
+    
+    std::string Armor::getModel(const MWWorld::Ptr &ptr) const
     {
         MWWorld::LiveCellRef<ESM::Armor> *ref =
             ptr.get<ESM::Armor>();
+        assert(ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
-        if(!model.empty()){
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
+        if (!model.empty()) {
+            return "meshes\\" + model;
         }
-
+        return "";
     }
 
     std::string Armor::getName (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwclass/armor.hpp b/apps/openmw/mwclass/armor.hpp
index a63806162..181a4ce61 100644
--- a/apps/openmw/mwclass/armor.hpp
+++ b/apps/openmw/mwclass/armor.hpp
@@ -66,6 +66,7 @@ namespace MWClass
                 const;
             ///< Generate action for using via inventory menu
 
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index a37da0fd7..62b6c8204 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -23,32 +23,33 @@ namespace MWClass
 {
     void Book::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        MWWorld::LiveCellRef<ESM::Book> *ref =
-            ptr.get<ESM::Book>();
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
+        const std::string model = getModel(ptr);
+        if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Book::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
+    {
+        const std::string model = getModel(ptr);
+        if(!model.empty()) {
+            physics.insertObjectPhysics(ptr, model);
+        }
+    }
+    
+    std::string Book::getModel(const MWWorld::Ptr &ptr) const
     {
         MWWorld::LiveCellRef<ESM::Book> *ref =
             ptr.get<ESM::Book>();
-
+        assert(ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
-        if(!model.empty()){
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
+        if (!model.empty()) {
+            return "meshes\\" + model;
         }
-
+        return "";
     }
 
     std::string Book::getName (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwclass/book.hpp b/apps/openmw/mwclass/book.hpp
index ee3aac8d8..20ea89274 100644
--- a/apps/openmw/mwclass/book.hpp
+++ b/apps/openmw/mwclass/book.hpp
@@ -50,6 +50,8 @@ namespace MWClass
 
             virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr) const;
             ///< Generate action for using via inventory menu
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index 6c34b5e56..e1ec5a61c 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -25,32 +25,33 @@ namespace MWClass
 {
     void Clothing::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        MWWorld::LiveCellRef<ESM::Clothing> *ref =
-            ptr.get<ESM::Clothing>();
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
+        const std::string model = getModel(ptr);
+        if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Clothing::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
+    {
+        const std::string model = getModel(ptr);
+        if(!model.empty()) {
+            physics.insertObjectPhysics(ptr, model);
+        }
+    }
+    
+    std::string Clothing::getModel(const MWWorld::Ptr &ptr) const
     {
         MWWorld::LiveCellRef<ESM::Clothing> *ref =
             ptr.get<ESM::Clothing>();
-
+        assert(ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
-        if(!model.empty()){
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
+        if (!model.empty()) {
+            return "meshes\\" + model;
         }
-
+        return "";
     }
 
     std::string Clothing::getName (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwclass/clothing.hpp b/apps/openmw/mwclass/clothing.hpp
index aba317be0..6b5fe1e96 100644
--- a/apps/openmw/mwclass/clothing.hpp
+++ b/apps/openmw/mwclass/clothing.hpp
@@ -59,6 +59,8 @@ namespace MWClass
             virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)
                 const;
             ///< Generate action for using via inventory menu
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 8dd27db42..7c5719b8e 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -54,32 +54,33 @@ namespace MWClass
 
     void Container::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        MWWorld::LiveCellRef<ESM::Container> *ref =
-            ptr.get<ESM::Container>();
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
+        const std::string model = getModel(ptr);
+        if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Container::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
+    {
+        const std::string model = getModel(ptr);
+        if(!model.empty()) {
+            physics.insertObjectPhysics(ptr, model);
+        }
+    }
+    
+    std::string Container::getModel(const MWWorld::Ptr &ptr) const
     {
         MWWorld::LiveCellRef<ESM::Container> *ref =
             ptr.get<ESM::Container>();
-
+        assert(ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
-        if(!model.empty()){
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
+        if (!model.empty()) {
+            return "meshes\\" + model;
         }
-
+        return "";
     }
 
     boost::shared_ptr<MWWorld::Action> Container::activate (const MWWorld::Ptr& ptr,
diff --git a/apps/openmw/mwclass/container.hpp b/apps/openmw/mwclass/container.hpp
index 739c75c77..17a9ac4ea 100644
--- a/apps/openmw/mwclass/container.hpp
+++ b/apps/openmw/mwclass/container.hpp
@@ -51,6 +51,8 @@ namespace MWClass
             ///< Unlock object
 
             static void registerSelf();
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 83370478f..178a6f536 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -86,17 +86,25 @@ namespace MWClass
     }
 
     void Creature::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
+    {
+        const std::string model = getModel(ptr);
+        if(!model.empty()){
+            physics.insertActorPhysics(ptr, model);
+        }
+        MWBase::Environment::get().getMechanicsManager()->addActor (ptr);
+    }
+
+    std::string Creature::getModel(const MWWorld::Ptr &ptr) const
     {
         MWWorld::LiveCellRef<ESM::Creature> *ref =
             ptr.get<ESM::Creature>();
+        assert (ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
-        if(!model.empty()){
-            physics.insertActorPhysics(ptr, "meshes\\" + model);
+        if (!model.empty()) {
+            return "meshes\\" + model;
         }
-
-        MWBase::Environment::get().getMechanicsManager()->addActor (ptr);
+        return "";        
     }
 
     std::string Creature::getName (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index 1274be09a..b994e0831 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -54,6 +54,8 @@ namespace MWClass
             /// effects). Throws an exception, if the object can't hold other objects.
 
             static void registerSelf();
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index b0bba2c03..1274219a9 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -25,30 +25,33 @@ namespace MWClass
 {
     void Door::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-         MWWorld::LiveCellRef<ESM::Door> *ref =
-            ptr.get<ESM::Door>();
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
+        const std::string model = getModel(ptr);
+        if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Door::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
     {
-         MWWorld::LiveCellRef<ESM::Door> *ref =
+        const std::string model = getModel(ptr);
+        if(!model.empty()) {
+            physics.insertObjectPhysics(ptr, model);
+        }
+    }
+    
+    std::string Door::getModel(const MWWorld::Ptr &ptr) const
+    {
+        MWWorld::LiveCellRef<ESM::Door> *ref =
             ptr.get<ESM::Door>();
+        assert(ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
-        if(!model.empty()){
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
+        if (!model.empty()) {
+            return "meshes\\" + model;
         }
+        return "";
     }
 
     std::string Door::getName (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwclass/door.hpp b/apps/openmw/mwclass/door.hpp
index 63d1c1ab8..2612df41c 100644
--- a/apps/openmw/mwclass/door.hpp
+++ b/apps/openmw/mwclass/door.hpp
@@ -38,6 +38,8 @@ namespace MWClass
             ///< Return name of the script attached to ptr
 
             static void registerSelf();
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index 01146fe67..a2f14c02c 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -23,30 +23,33 @@ namespace MWClass
 {
     void Ingredient::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        MWWorld::LiveCellRef<ESM::Ingredient> *ref =
-            ptr.get<ESM::Ingredient>();
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
+        const std::string model = getModel(ptr);
+        if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Ingredient::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
+    {
+        const std::string model = getModel(ptr);
+        if(!model.empty()) {
+            physics.insertObjectPhysics(ptr, model);
+        }
+    }
+    
+    std::string Ingredient::getModel(const MWWorld::Ptr &ptr) const
     {
         MWWorld::LiveCellRef<ESM::Ingredient> *ref =
             ptr.get<ESM::Ingredient>();
+        assert(ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
-        if(!model.empty()){
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
+        if (!model.empty()) {
+            return "meshes\\" + model;
         }
+        return "";
     }
 
     std::string Ingredient::getName (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwclass/ingredient.hpp b/apps/openmw/mwclass/ingredient.hpp
index 4c45bd69c..ad87dd46c 100644
--- a/apps/openmw/mwclass/ingredient.hpp
+++ b/apps/openmw/mwclass/ingredient.hpp
@@ -44,6 +44,8 @@ namespace MWClass
 
             virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
             ///< Return name of inventory icon.
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index 15cd89ac2..37d7d1eec 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -28,8 +28,8 @@ namespace MWClass
     {
         MWWorld::LiveCellRef<ESM::Light> *ref =
             ptr.get<ESM::Light>();
-
         assert (ref->base != NULL);
+
         const std::string &model = ref->base->model;
 
         MWRender::Objects& objects = renderingInterface.getObjects();
@@ -50,20 +50,31 @@ namespace MWClass
     {
         MWWorld::LiveCellRef<ESM::Light> *ref =
             ptr.get<ESM::Light>();
-
         assert (ref->base != NULL);
+
         const std::string &model = ref->base->model;
 
-        if(!model.empty()){
+        if(!model.empty()) {
             physics.insertObjectPhysics(ptr, "meshes\\" + model);
         }
-
-        if (!ref->base->sound.empty())
-        {
-            MWBase::Environment::get().getSoundManager()->playSound3D (ptr, ref->base->sound, 1.0, 1.0, MWSound::Play_Loop);
+        if (!ref->base->sound.empty()) {
+            MWBase::Environment::get().getSoundManager()->playSound3D(ptr, ref->base->sound, 1.0, 1.0, MWSound::Play_Loop);
         }
     }
 
+    std::string Light::getModel(const MWWorld::Ptr &ptr) const
+    {
+        MWWorld::LiveCellRef<ESM::Light> *ref =
+            ptr.get<ESM::Light>();
+        assert (ref->base != NULL);
+
+        const std::string &model = ref->base->model;
+        if (!model.empty()) {
+            return "meshes\\" + model;
+        }
+        return "";
+    }
+
     std::string Light::getName (const MWWorld::Ptr& ptr) const
     {
         MWWorld::LiveCellRef<ESM::Light> *ref =
diff --git a/apps/openmw/mwclass/light.hpp b/apps/openmw/mwclass/light.hpp
index 91193dfdc..ab8854efd 100644
--- a/apps/openmw/mwclass/light.hpp
+++ b/apps/openmw/mwclass/light.hpp
@@ -52,6 +52,8 @@ namespace MWClass
             virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)
                 const;
             ///< Generate action for using via inventory menu
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index d3d60315f..ae2b5de89 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -25,35 +25,35 @@ namespace MWClass
 {
     void Lockpick::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        MWWorld::LiveCellRef<ESM::Tool> *ref =
-            ptr.get<ESM::Tool>();
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
+        const std::string model = getModel(ptr);
+        if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Lockpick::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
+    {
+        const std::string model = getModel(ptr);
+        if(!model.empty()) {
+            physics.insertObjectPhysics(ptr, model);
+        }
+    }
+    
+    std::string Lockpick::getModel(const MWWorld::Ptr &ptr) const
     {
         MWWorld::LiveCellRef<ESM::Tool> *ref =
             ptr.get<ESM::Tool>();
-
+        assert(ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
-        if(!model.empty()){
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
+        if (!model.empty()) {
+            return "meshes\\" + model;
         }
-
+        return "";
     }
 
-
     std::string Lockpick::getName (const MWWorld::Ptr& ptr) const
     {
         MWWorld::LiveCellRef<ESM::Tool> *ref =
diff --git a/apps/openmw/mwclass/lockpick.hpp b/apps/openmw/mwclass/lockpick.hpp
index 26aab584c..45a02d40d 100644
--- a/apps/openmw/mwclass/lockpick.hpp
+++ b/apps/openmw/mwclass/lockpick.hpp
@@ -52,6 +52,8 @@ namespace MWClass
             virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)
                 const;
             ///< Generate action for using via inventory menu
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index 8484a5dd1..89c1ef25f 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -27,32 +27,33 @@ namespace MWClass
 {
     void Miscellaneous::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        MWWorld::LiveCellRef<ESM::Miscellaneous> *ref =
-            ptr.get<ESM::Miscellaneous>();
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
+        const std::string model = getModel(ptr);
+        if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Miscellaneous::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
+    {
+        const std::string model = getModel(ptr);
+        if(!model.empty()) {
+            physics.insertObjectPhysics(ptr, model);
+        }
+    }
+    
+    std::string Miscellaneous::getModel(const MWWorld::Ptr &ptr) const
     {
         MWWorld::LiveCellRef<ESM::Miscellaneous> *ref =
             ptr.get<ESM::Miscellaneous>();
-
+        assert(ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
-        if(!model.empty()){
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
+        if (!model.empty()) {
+            return "meshes\\" + model;
         }
-
+        return "";
     }
 
     std::string Miscellaneous::getName (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwclass/misc.hpp b/apps/openmw/mwclass/misc.hpp
index da5f0df96..23b5e9564 100644
--- a/apps/openmw/mwclass/misc.hpp
+++ b/apps/openmw/mwclass/misc.hpp
@@ -44,6 +44,8 @@ namespace MWClass
 
             virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
             ///< Return name of inventory icon.
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 80bff73fa..a5525fcda 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -125,25 +125,29 @@ namespace MWClass
 
     void Npc::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
     {
+        physics.insertActorPhysics(ptr, getModel(ptr));
+        MWBase::Environment::get().getMechanicsManager()->addActor(ptr);
+    }
 
+    std::string Npc::getModel(const MWWorld::Ptr &ptr) const
+    {
         MWWorld::LiveCellRef<ESM::NPC> *ref =
             ptr.get<ESM::NPC>();
-
-        assert (ref->base != NULL);
-
-
+        assert(ref->base != NULL);
 
         std::string headID = ref->base->head;
-        std::string bodyRaceID = headID.substr(0, headID.find_last_of("head_") - 4);
-        bool beast = bodyRaceID == "b_n_khajiit_m_" || bodyRaceID == "b_n_khajiit_f_" || bodyRaceID == "b_n_argonian_m_" || bodyRaceID == "b_n_argonian_f_";
+        int end = headID.find_last_of("head_") - 4;
+        std::string bodyRaceID = headID.substr(0, end);
 
-        std::string smodel = "meshes\\base_anim.nif";
-        if(beast)
-            smodel = "meshes\\base_animkna.nif";
-         physics.insertActorPhysics(ptr, smodel);
-
-
-        MWBase::Environment::get().getMechanicsManager()->addActor (ptr);
+        std::string model = "meshes\\base_anim.nif";
+        if (bodyRaceID == "b_n_khajiit_m_" ||
+            bodyRaceID == "b_n_khajiit_f_" ||
+            bodyRaceID == "b_n_argonian_m_" ||
+            bodyRaceID == "b_n_argonian_f_")
+        {
+            model = "meshes\\base_animkna.nif";
+        }
+        return model;
     }
 
     std::string Npc::getName (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwclass/npc.hpp b/apps/openmw/mwclass/npc.hpp
index b32a162a1..0ea45d132 100644
--- a/apps/openmw/mwclass/npc.hpp
+++ b/apps/openmw/mwclass/npc.hpp
@@ -88,6 +88,8 @@ namespace MWClass
             virtual void adjustRotation(const MWWorld::Ptr& ptr,float& x,float& y,float& z) const;
 
             static void registerSelf();
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index 45cb07840..92a951d03 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -25,32 +25,33 @@ namespace MWClass
 {
     void Potion::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        MWWorld::LiveCellRef<ESM::Potion> *ref =
-            ptr.get<ESM::Potion>();
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
+        const std::string model = getModel(ptr);
+        if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Potion::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
+    {
+        const std::string model = getModel(ptr);
+        if(!model.empty()) {
+            physics.insertObjectPhysics(ptr, model);
+        }
+    }
+    
+    std::string Potion::getModel(const MWWorld::Ptr &ptr) const
     {
         MWWorld::LiveCellRef<ESM::Potion> *ref =
             ptr.get<ESM::Potion>();
-
+        assert(ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
-        if(!model.empty()){
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
+        if (!model.empty()) {
+            return "meshes\\" + model;
         }
-
+        return "";
     }
 
     std::string Potion::getName (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwclass/potion.hpp b/apps/openmw/mwclass/potion.hpp
index 101f4cefa..39edfd760 100644
--- a/apps/openmw/mwclass/potion.hpp
+++ b/apps/openmw/mwclass/potion.hpp
@@ -47,6 +47,8 @@ namespace MWClass
 
             virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
             ///< Return name of inventory icon.
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index f3a8406f5..033eee4c5 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -25,35 +25,35 @@ namespace MWClass
 {
     void Probe::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        MWWorld::LiveCellRef<ESM::Probe> *ref =
-            ptr.get<ESM::Probe>();
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
+        const std::string model = getModel(ptr);
+        if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Probe::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
+    {
+        const std::string model = getModel(ptr);
+        if(!model.empty()) {
+            physics.insertObjectPhysics(ptr, model);
+        }
+    }
+    
+    std::string Probe::getModel(const MWWorld::Ptr &ptr) const
     {
         MWWorld::LiveCellRef<ESM::Probe> *ref =
             ptr.get<ESM::Probe>();
-
+        assert(ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
-        if(!model.empty()){
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
+        if (!model.empty()) {
+            return "meshes\\" + model;
         }
-
+        return "";
     }
 
-
     std::string Probe::getName (const MWWorld::Ptr& ptr) const
     {
         MWWorld::LiveCellRef<ESM::Probe> *ref =
diff --git a/apps/openmw/mwclass/probe.hpp b/apps/openmw/mwclass/probe.hpp
index 51b046fda..ff10eb9d6 100644
--- a/apps/openmw/mwclass/probe.hpp
+++ b/apps/openmw/mwclass/probe.hpp
@@ -52,6 +52,8 @@ namespace MWClass
             virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)
                 const;
             ///< Generate action for using via inventory menu
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index 464ba1091..4258ad106 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -23,32 +23,33 @@ namespace MWClass
 {
     void Repair::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        MWWorld::LiveCellRef<ESM::Repair> *ref =
-            ptr.get<ESM::Repair>();
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
+        const std::string model = getModel(ptr);
+        if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Repair::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
+    {
+        const std::string model = getModel(ptr);
+        if(!model.empty()) {
+            physics.insertObjectPhysics(ptr, model);
+        }
+    }
+    
+    std::string Repair::getModel(const MWWorld::Ptr &ptr) const
     {
         MWWorld::LiveCellRef<ESM::Repair> *ref =
             ptr.get<ESM::Repair>();
-
+        assert(ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
-        if(!model.empty()){
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
+        if (!model.empty()) {
+            return "meshes\\" + model;
         }
-
+        return "";
     }
 
     std::string Repair::getName (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwclass/repair.hpp b/apps/openmw/mwclass/repair.hpp
index 1e935e154..689850b90 100644
--- a/apps/openmw/mwclass/repair.hpp
+++ b/apps/openmw/mwclass/repair.hpp
@@ -44,6 +44,8 @@ namespace MWClass
 
             virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
             ///< Return name of inventory icon.
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 
diff --git a/apps/openmw/mwclass/static.cpp b/apps/openmw/mwclass/static.cpp
index 9b166b076..a14adc300 100644
--- a/apps/openmw/mwclass/static.cpp
+++ b/apps/openmw/mwclass/static.cpp
@@ -13,31 +13,33 @@ namespace MWClass
 {
     void Static::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        MWWorld::LiveCellRef<ESM::Static> *ref =
-            ptr.get<ESM::Static>();
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
+        const std::string model = getModel(ptr);
+        if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), true);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Static::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
+    {
+        const std::string model = getModel(ptr);
+        if(!model.empty()) {
+            physics.insertObjectPhysics(ptr, model);
+        }
+    }
+    
+    std::string Static::getModel(const MWWorld::Ptr &ptr) const
     {
         MWWorld::LiveCellRef<ESM::Static> *ref =
             ptr.get<ESM::Static>();
+        assert(ref->base != NULL);
 
-        assert (ref->base != NULL);
         const std::string &model = ref->base->model;
-
-        if(!model.empty()){
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
+        if (!model.empty()) {
+            return "meshes\\" + model;
         }
+        return "";
     }
 
     std::string Static::getName (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwclass/static.hpp b/apps/openmw/mwclass/static.hpp
index c223df1ac..3066933e4 100644
--- a/apps/openmw/mwclass/static.hpp
+++ b/apps/openmw/mwclass/static.hpp
@@ -19,6 +19,8 @@ namespace MWClass
             /// can return an empty string.
 
             static void registerSelf();
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index 099312d2c..6412a46b1 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -25,32 +25,33 @@ namespace MWClass
 {
     void Weapon::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        MWWorld::LiveCellRef<ESM::Weapon> *ref =
-            ptr.get<ESM::Weapon>();
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
+        const std::string model = getModel(ptr);
+        if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Weapon::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
+    {
+        const std::string model = getModel(ptr);
+        if(!model.empty()) {
+            physics.insertObjectPhysics(ptr, model);
+        }
+    }
+    
+    std::string Weapon::getModel(const MWWorld::Ptr &ptr) const
     {
         MWWorld::LiveCellRef<ESM::Weapon> *ref =
             ptr.get<ESM::Weapon>();
-
+        assert(ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
-        if(!model.empty()){
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
+        if (!model.empty()) {
+            return "meshes\\" + model;
         }
-
+        return "";
     }
 
     std::string Weapon::getName (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwclass/weapon.hpp b/apps/openmw/mwclass/weapon.hpp
index 92d703b4a..eaf5b60a4 100644
--- a/apps/openmw/mwclass/weapon.hpp
+++ b/apps/openmw/mwclass/weapon.hpp
@@ -66,6 +66,7 @@ namespace MWClass
                 const;
             ///< Generate action for using via inventory menu
 
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index f973301c5..729746f6b 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -213,7 +213,7 @@ namespace MWWorld
     {
     }
 
-    std::string Class::getModel() const
+    std::string Class::getModel(const MWWorld::Ptr &ptr) const
     {
         return "";
     }
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 5f16ef593..c8b51eeab 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -205,7 +205,7 @@ namespace MWWorld
 
             virtual void adjustRotation(const MWWorld::Ptr& ptr,float& x,float& y,float& z) const;
 
-            virtual std::string getModel() const;
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 
diff --git a/apps/openmw/mwworld/physicssystem.cpp b/apps/openmw/mwworld/physicssystem.cpp
index db1db0505..1eba439a8 100644
--- a/apps/openmw/mwworld/physicssystem.cpp
+++ b/apps/openmw/mwworld/physicssystem.cpp
@@ -367,12 +367,11 @@ namespace MWWorld
      }
 
      float PhysicsSystem::getObjectHeight(const MWWorld::Ptr &ptr) {
-        std::string model = MWWorld::Class::get(ptr).getModel();
+        std::string model = MWWorld::Class::get(ptr).getModel(ptr);
         if (model.empty()) {
             return 0.0;
         }
         float scale = ptr.getRefData().getBaseNode()->getScale().x;
         return mEngine->getObjectHeight(model, scale);
      }
-
 }

From e1c7d1f52936988f2093db7a9800093c1cfac927 Mon Sep 17 00:00:00 2001
From: greye <greye@null.net>
Date: Tue, 24 Jul 2012 22:08:23 +0400
Subject: [PATCH 09/20] fixed item sinking

---
 apps/openmw/mwworld/physicssystem.cpp | 31 ++++++++++++++-------------
 apps/openmw/mwworld/scene.cpp         |  6 ++++++
 apps/openmw/mwworld/worldimp.cpp      |  4 ++--
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/apps/openmw/mwworld/physicssystem.cpp b/apps/openmw/mwworld/physicssystem.cpp
index 1eba439a8..2b3d4b0f4 100644
--- a/apps/openmw/mwworld/physicssystem.cpp
+++ b/apps/openmw/mwworld/physicssystem.cpp
@@ -349,29 +349,30 @@ namespace MWWorld
         throw std::logic_error ("can't find player");
     }
 
-     void PhysicsSystem::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string model){
+    void PhysicsSystem::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string model){
 
-           Ogre::SceneNode* node = ptr.getRefData().getBaseNode();
+        Ogre::SceneNode* node = ptr.getRefData().getBaseNode();
 
-           // unused
-		   //Ogre::Vector3 objPos = node->getPosition();
+        addObject(
+            node->getName(),
+            model,
+            node->getOrientation(),
+            node->getScale().x,
+            node->getPosition());
+    }
 
-         addObject (node->getName(), model, node->getOrientation(),
-            node->getScale().x, node->getPosition());
-     }
+    void PhysicsSystem::insertActorPhysics(const MWWorld::Ptr& ptr, const std::string model){
+        Ogre::SceneNode* node = ptr.getRefData().getBaseNode();
+        addActor (node->getName(), model, node->getPosition());
+    }
 
-     void PhysicsSystem::insertActorPhysics(const MWWorld::Ptr& ptr, const std::string model){
-           Ogre::SceneNode* node = ptr.getRefData().getBaseNode();
-            // std::cout << "Adding node with name" << node->getName();
-         addActor (node->getName(), model, node->getPosition());
-     }
-
-     float PhysicsSystem::getObjectHeight(const MWWorld::Ptr &ptr) {
+    float PhysicsSystem::getObjectHeight(const MWWorld::Ptr &ptr)
+    {
         std::string model = MWWorld::Class::get(ptr).getModel(ptr);
         if (model.empty()) {
             return 0.0;
         }
         float scale = ptr.getRefData().getBaseNode()->getScale().x;
         return mEngine->getObjectHeight(model, scale);
-     }
+    }
 }
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 9786c24d9..b78669ef5 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -335,6 +335,12 @@ namespace MWWorld
     void Scene::addObjectToScene (const Ptr& ptr)
     {
         mRendering.addObject (ptr);
+
+        float *pos = ptr.getRefData().getPosition().pos;
+        pos[2] += mPhysics->getObjectHeight(ptr) / 2;
+
+        ptr.getRefData().getBaseNode()->setPosition(pos[0], pos[1], pos[2]);
+
         MWWorld::Class::get (ptr).insertObject (ptr, *mPhysics);
     }
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index efb17a709..3d409570b 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1024,8 +1024,6 @@ namespace MWWorld
         MWWorld::Ptr dropped = cell->insertObject(object, pos);
         mWorldScene->addObjectToScene(dropped);
 
-        /// \todo retrieve the bounds of the object and translate it accordingly
-
         return true;
     }
 
@@ -1047,6 +1045,8 @@ namespace MWWorld
         ESM::Position &pos =
             getPlayer().getPlayer().getRefData().getPosition();
 
+        /// \todo fix item dropping at player object center position
+
         MWWorld::Ptr dropped = cell->insertObject(object, pos);
 
         mWorldScene->addObjectToScene(dropped);

From aff05b9d36f102634334219b61ea253a4e7a8dc7 Mon Sep 17 00:00:00 2001
From: greye <greye@null.net>
Date: Wed, 25 Jul 2012 00:03:31 +0400
Subject: [PATCH 10/20] local script registration

---
 apps/openmw/mwworld/worldimp.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 3d409570b..670b3e512 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1023,6 +1023,9 @@ namespace MWWorld
 
         MWWorld::Ptr dropped = cell->insertObject(object, pos);
         mWorldScene->addObjectToScene(dropped);
+        mLocalScripts.add(
+            MWWorld::Class::get(dropped).getScript(),
+            dropped);
 
         return true;
     }
@@ -1050,6 +1053,9 @@ namespace MWWorld
         MWWorld::Ptr dropped = cell->insertObject(object, pos);
 
         mWorldScene->addObjectToScene(dropped);
+        mLocalScripts.add(
+            MWWorld::Class::get(dropped).getScript(),
+            dropped);
     }
 
     void World::processChangedSettings(const Settings::CategorySettingVector& settings)

From d5fe378a6622445076dea86779a318d6b18e57c5 Mon Sep 17 00:00:00 2001
From: greye <greye@null.net>
Date: Wed, 25 Jul 2012 10:02:43 +0400
Subject: [PATCH 11/20] Revert "local script registration"

This reverts commit 0686399a306319a4c49e1009d10215a9c0e65ec2.
---
 apps/openmw/mwworld/worldimp.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 670b3e512..3d409570b 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1023,9 +1023,6 @@ namespace MWWorld
 
         MWWorld::Ptr dropped = cell->insertObject(object, pos);
         mWorldScene->addObjectToScene(dropped);
-        mLocalScripts.add(
-            MWWorld::Class::get(dropped).getScript(),
-            dropped);
 
         return true;
     }
@@ -1053,9 +1050,6 @@ namespace MWWorld
         MWWorld::Ptr dropped = cell->insertObject(object, pos);
 
         mWorldScene->addObjectToScene(dropped);
-        mLocalScripts.add(
-            MWWorld::Class::get(dropped).getScript(),
-            dropped);
     }
 
     void World::processChangedSettings(const Settings::CategorySettingVector& settings)

From bcc47cd5fb00858c481fff542fad19cac52a79f8 Mon Sep 17 00:00:00 2001
From: greye <greye@null.net>
Date: Wed, 25 Jul 2012 10:47:59 +0400
Subject: [PATCH 12/20] local scripts, move placing to World::placeObject(Ptr,
 CellStore, Position)

---
 apps/openmw/mwbase/world.hpp     |  8 ++++++++
 apps/openmw/mwworld/worldimp.cpp | 22 ++++++++++++++++------
 apps/openmw/mwworld/worldimp.hpp |  3 +++
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 6937cbf3b..f257b723e 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -54,6 +54,14 @@ namespace MWBase
             World& operator= (const World&);
             ///< not implemented
 
+        protected:
+
+            virtual void
+            placeObject(
+                const MWWorld::Ptr &ptr,
+                MWWorld::CellStore &cell,
+                const ESM::Position &pos) = 0;
+
         public:
 
             enum RenderMode
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 3d409570b..19cdcc334 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1021,8 +1021,7 @@ namespace MWWorld
         pos.pos[1] = -result.second[2];
         pos.pos[2] = result.second[1];
 
-        MWWorld::Ptr dropped = cell->insertObject(object, pos);
-        mWorldScene->addObjectToScene(dropped);
+        placeObject(object, *cell, pos);
 
         return true;
     }
@@ -1038,6 +1037,20 @@ namespace MWWorld
         return true;
     }
 
+    void
+    World::placeObject(const Ptr &object, CellStore &cell, const ESM::Position &pos)
+    {
+        mLocalScripts.remove(object);
+
+        MWWorld::Ptr dropped = cell.insertObject(object, pos);
+        mWorldScene->addObjectToScene(dropped);
+
+        std::string script = MWWorld::Class::get(dropped).getScript(dropped);
+        if (!script.empty()) {
+            mLocalScripts.add(script, dropped);
+        }
+    }
+
     void World::dropObjectOnGround (const Ptr& object)
     {
         MWWorld::Ptr::CellStore* cell = getPlayer().getPlayer().getCell();
@@ -1046,10 +1059,7 @@ namespace MWWorld
             getPlayer().getPlayer().getRefData().getPosition();
 
         /// \todo fix item dropping at player object center position
-
-        MWWorld::Ptr dropped = cell->insertObject(object, pos);
-
-        mWorldScene->addObjectToScene(dropped);
+        placeObject(object, *cell, pos);
     }
 
     void World::processChangedSettings(const Settings::CategorySettingVector& settings)
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 43b178fe3..d39871c21 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -89,6 +89,9 @@ namespace MWWorld
             bool moveObjectImp (const Ptr& ptr, float x, float y, float z);
             ///< @return true if the active cell (cell player is in) changed
 
+            virtual void
+            placeObject(const Ptr &ptr, CellStore &cell, const ESM::Position &pos);
+
         public:
 
             World (OEngine::Render::OgreRenderer& renderer,

From e7666d3a7fd22a9489ec60244678cd3664532003 Mon Sep 17 00:00:00 2001
From: greye <greye@null.net>
Date: Wed, 25 Jul 2012 17:18:17 +0400
Subject: [PATCH 13/20] move responsibility for cell changing from
 CellStore::insertObject to Class::moveToCell

---
 apps/openmw/mwclass/activator.cpp  |  10 +++
 apps/openmw/mwclass/activator.hpp  |   4 +
 apps/openmw/mwclass/apparatus.cpp  |   9 +++
 apps/openmw/mwclass/apparatus.hpp  |   4 +
 apps/openmw/mwclass/armor.cpp      |   9 +++
 apps/openmw/mwclass/armor.hpp      |   3 +
 apps/openmw/mwclass/book.cpp       |   8 ++
 apps/openmw/mwclass/book.hpp       |   3 +
 apps/openmw/mwclass/clothing.cpp   |   9 +++
 apps/openmw/mwclass/clothing.hpp   |   3 +
 apps/openmw/mwclass/container.cpp  |   9 +++
 apps/openmw/mwclass/container.hpp  |   4 +
 apps/openmw/mwclass/creature.cpp   |   9 +++
 apps/openmw/mwclass/creature.hpp   |   3 +
 apps/openmw/mwclass/door.cpp       |   9 +++
 apps/openmw/mwclass/door.hpp       |   3 +
 apps/openmw/mwclass/ingredient.cpp |   9 +++
 apps/openmw/mwclass/ingredient.hpp |   3 +
 apps/openmw/mwclass/light.cpp      |   9 +++
 apps/openmw/mwclass/light.hpp      |   3 +
 apps/openmw/mwclass/lockpick.cpp   |   9 +++
 apps/openmw/mwclass/lockpick.hpp   |   3 +
 apps/openmw/mwclass/misc.cpp       |  36 +++++++++
 apps/openmw/mwclass/misc.hpp       |   3 +
 apps/openmw/mwclass/npc.cpp        |   9 +++
 apps/openmw/mwclass/npc.hpp        |   3 +
 apps/openmw/mwclass/potion.cpp     |  10 +++
 apps/openmw/mwclass/potion.hpp     |   3 +
 apps/openmw/mwclass/probe.cpp      |  10 +++
 apps/openmw/mwclass/probe.hpp      |   5 +-
 apps/openmw/mwclass/repair.cpp     |   9 +++
 apps/openmw/mwclass/repair.hpp     |   5 +-
 apps/openmw/mwclass/static.cpp     |   9 +++
 apps/openmw/mwclass/static.hpp     |   3 +
 apps/openmw/mwclass/weapon.cpp     |   9 +++
 apps/openmw/mwclass/weapon.hpp     |   3 +
 apps/openmw/mwworld/cellstore.cpp  | 119 -----------------------------
 apps/openmw/mwworld/cellstore.hpp  |   6 +-
 apps/openmw/mwworld/class.cpp      |  31 ++++++++
 apps/openmw/mwworld/class.hpp      |  14 ++++
 apps/openmw/mwworld/worldimp.cpp   |   4 +-
 41 files changed, 300 insertions(+), 126 deletions(-)

diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index 33baad7ca..d0f09e80e 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -94,4 +94,14 @@ namespace MWClass
 
         return info;
     }
+
+    MWWorld::Ptr
+    Activator::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Activator> *ref =
+            ptr.get<ESM::Activator>();
+
+        return MWWorld::Ptr(&cell.activators.insert(*ref), &cell);
+    }
 }
+
diff --git a/apps/openmw/mwclass/activator.hpp b/apps/openmw/mwclass/activator.hpp
index 2e947a9fc..26aafb717 100644
--- a/apps/openmw/mwclass/activator.hpp
+++ b/apps/openmw/mwclass/activator.hpp
@@ -7,6 +7,10 @@ namespace MWClass
 {
     class Activator : public MWWorld::Class
     {
+
+            virtual MWWorld::Ptr
+            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index dd255f9f8..6322c963e 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -149,4 +149,13 @@ namespace MWClass
     {
         return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionAlchemy());
     }
+
+    MWWorld::Ptr
+    Apparatus::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Apparatus> *ref =
+            ptr.get<ESM::Apparatus>();
+
+        return MWWorld::Ptr(&cell.appas.insert(*ref), &cell);
+    }
 }
diff --git a/apps/openmw/mwclass/apparatus.hpp b/apps/openmw/mwclass/apparatus.hpp
index fa77eec93..9352e0617 100644
--- a/apps/openmw/mwclass/apparatus.hpp
+++ b/apps/openmw/mwclass/apparatus.hpp
@@ -7,6 +7,10 @@ namespace MWClass
 {
     class Apparatus : public MWWorld::Class
     {
+
+            virtual MWWorld::Ptr
+            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index 8bbb198cc..aeefcd42b 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -276,4 +276,13 @@ namespace MWClass
 
         return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionEquip(ptr));
     }
+
+    MWWorld::Ptr
+    Armor::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Armor> *ref =
+            ptr.get<ESM::Armor>();
+
+        return MWWorld::Ptr(&cell.armors.insert(*ref), &cell);
+    }
 }
diff --git a/apps/openmw/mwclass/armor.hpp b/apps/openmw/mwclass/armor.hpp
index 181a4ce61..960b6dad5 100644
--- a/apps/openmw/mwclass/armor.hpp
+++ b/apps/openmw/mwclass/armor.hpp
@@ -7,6 +7,9 @@ namespace MWClass
 {
     class Armor : public MWWorld::Class
     {
+            virtual MWWorld::Ptr
+            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index 62b6c8204..1517f090a 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -157,4 +157,12 @@ namespace MWClass
         return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionRead(ptr));
     }
 
+    MWWorld::Ptr
+    Book::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Book> *ref =
+            ptr.get<ESM::Book>();
+
+        return MWWorld::Ptr(&cell.books.insert(*ref), &cell);
+    }
 }
diff --git a/apps/openmw/mwclass/book.hpp b/apps/openmw/mwclass/book.hpp
index 20ea89274..adbf2d64b 100644
--- a/apps/openmw/mwclass/book.hpp
+++ b/apps/openmw/mwclass/book.hpp
@@ -7,6 +7,9 @@ namespace MWClass
 {
     class Book : public MWWorld::Class
     {
+            virtual MWWorld::Ptr
+            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index e1ec5a61c..86c031db0 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -227,4 +227,13 @@ namespace MWClass
 
         return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionEquip(ptr));
     }
+
+    MWWorld::Ptr
+    Clothing::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Clothing> *ref =
+            ptr.get<ESM::Clothing>();
+
+        return MWWorld::Ptr(&cell.clothes.insert(*ref), &cell);
+    }
 }
diff --git a/apps/openmw/mwclass/clothing.hpp b/apps/openmw/mwclass/clothing.hpp
index 6b5fe1e96..2c0d0b8a5 100644
--- a/apps/openmw/mwclass/clothing.hpp
+++ b/apps/openmw/mwclass/clothing.hpp
@@ -7,6 +7,9 @@ namespace MWClass
 {
     class Clothing : public MWWorld::Class
     {
+            virtual MWWorld::Ptr
+            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 7c5719b8e..2543f6acd 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -207,4 +207,13 @@ namespace MWClass
     {
         ptr.getCellRef().lockLevel = 0;
     }
+
+    MWWorld::Ptr
+    Container::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Container> *ref =
+            ptr.get<ESM::Container>();
+
+        return MWWorld::Ptr(&cell.containers.insert(*ref), &cell);
+    }
 }
diff --git a/apps/openmw/mwclass/container.hpp b/apps/openmw/mwclass/container.hpp
index 17a9ac4ea..2f15d03d8 100644
--- a/apps/openmw/mwclass/container.hpp
+++ b/apps/openmw/mwclass/container.hpp
@@ -9,6 +9,10 @@ namespace MWClass
     {
             void ensureCustomData (const MWWorld::Ptr& ptr) const;
 
+
+            virtual MWWorld::Ptr
+            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) 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 178a6f536..8f885bf62 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -195,4 +195,13 @@ namespace MWClass
 
         return weight;
     }
+
+    MWWorld::Ptr
+    Creature::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Creature> *ref =
+            ptr.get<ESM::Creature>();
+
+        return MWWorld::Ptr(&cell.creatures.insert(*ref), &cell);
+    }
 }
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index b994e0831..38be98533 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -11,6 +11,9 @@ namespace MWClass
     {
             void ensureCustomData (const MWWorld::Ptr& ptr) const;
 
+            virtual MWWorld::Ptr
+            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
             virtual std::string getId (const MWWorld::Ptr& ptr) const;
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 1274219a9..8eef54725 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -209,4 +209,13 @@ namespace MWClass
 
         return info;
     }
+
+    MWWorld::Ptr
+    Door::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Door> *ref =
+            ptr.get<ESM::Door>();
+
+        return MWWorld::Ptr(&cell.doors.insert(*ref), &cell);
+    }
 }
diff --git a/apps/openmw/mwclass/door.hpp b/apps/openmw/mwclass/door.hpp
index 2612df41c..b89858556 100644
--- a/apps/openmw/mwclass/door.hpp
+++ b/apps/openmw/mwclass/door.hpp
@@ -7,6 +7,9 @@ namespace MWClass
 {
     class Door : public MWWorld::Class
     {
+            virtual MWWorld::Ptr
+            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index a2f14c02c..02e77fa25 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -156,4 +156,13 @@ namespace MWClass
 
         return info;
     }
+
+    MWWorld::Ptr
+    Ingredient::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Ingredient> *ref =
+            ptr.get<ESM::Ingredient>();
+
+        return MWWorld::Ptr(&cell.ingreds.insert(*ref), &cell);
+    }
 }
diff --git a/apps/openmw/mwclass/ingredient.hpp b/apps/openmw/mwclass/ingredient.hpp
index ad87dd46c..44ee0ccd0 100644
--- a/apps/openmw/mwclass/ingredient.hpp
+++ b/apps/openmw/mwclass/ingredient.hpp
@@ -7,6 +7,9 @@ namespace MWClass
 {
     class Ingredient : public MWWorld::Class
     {
+            virtual MWWorld::Ptr
+            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index 37d7d1eec..e7b3af2b9 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -196,4 +196,13 @@ namespace MWClass
 
         return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionEquip(ptr));
     }
+
+    MWWorld::Ptr
+    Light::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Light> *ref =
+            ptr.get<ESM::Light>();
+
+        return MWWorld::Ptr(&cell.lights.insert(*ref), &cell);
+    }
 }
diff --git a/apps/openmw/mwclass/light.hpp b/apps/openmw/mwclass/light.hpp
index ab8854efd..953078a35 100644
--- a/apps/openmw/mwclass/light.hpp
+++ b/apps/openmw/mwclass/light.hpp
@@ -7,6 +7,9 @@ namespace MWClass
 {
     class Light : public MWWorld::Class
     {
+            virtual MWWorld::Ptr
+            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
              virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index ae2b5de89..e72e96822 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -165,4 +165,13 @@ namespace MWClass
 
         return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionEquip(ptr));
     }
+
+    MWWorld::Ptr
+    Lockpick::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Tool> *ref =
+            ptr.get<ESM::Tool>();
+
+        return MWWorld::Ptr(&cell.lockpicks.insert(*ref), &cell);
+    }
 }
diff --git a/apps/openmw/mwclass/lockpick.hpp b/apps/openmw/mwclass/lockpick.hpp
index 45a02d40d..216dc10c9 100644
--- a/apps/openmw/mwclass/lockpick.hpp
+++ b/apps/openmw/mwclass/lockpick.hpp
@@ -7,6 +7,9 @@ namespace MWClass
 {
     class Lockpick : public MWWorld::Class
     {
+            virtual MWWorld::Ptr
+            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index 89c1ef25f..37f608ed2 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -12,6 +12,7 @@
 #include "../mwworld/actiontake.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/physicssystem.hpp"
+#include "../mwworld/manualref.hpp"
 
 #include "../mwgui/window_manager.hpp"
 #include "../mwgui/tooltips.hpp"
@@ -183,4 +184,39 @@ namespace MWClass
 
         return info;
     }
+
+    MWWorld::Ptr
+    Miscellaneous::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::Ptr newPtr;
+        
+        const ESMS::ESMStore &store =
+            MWBase::Environment::get().getWorld()->getStore();
+
+        if (MWWorld::Class::get(ptr).getName(ptr) == store.gameSettings.search("sGold")->str) {
+            int goldAmount = ptr.getRefData().getCount();
+
+            std::string base = "Gold_001";
+            if (goldAmount >= 100)
+                base = "Gold_100";
+            else if (goldAmount >= 25)
+                base = "Gold_025";
+            else if (goldAmount >= 10)
+                base = "Gold_010";
+            else if (goldAmount >= 5)
+                base = "Gold_005";
+
+            // Really, I have no idea why moving ref out of conditional
+            // scope causes list::push_back throwing std::bad_alloc
+            MWWorld::ManualRef newRef(store, base);
+            MWWorld::LiveCellRef<ESM::Miscellaneous> *ref =
+                newRef.getPtr().get<ESM::Miscellaneous>();
+            newPtr = MWWorld::Ptr(&cell.miscItems.insert(*ref), &cell);
+        } else {
+            MWWorld::LiveCellRef<ESM::Miscellaneous> *ref =
+                ptr.get<ESM::Miscellaneous>();
+            newPtr = MWWorld::Ptr(&cell.miscItems.insert(*ref), &cell);
+        }
+        return newPtr;
+    }
 }
diff --git a/apps/openmw/mwclass/misc.hpp b/apps/openmw/mwclass/misc.hpp
index 23b5e9564..2a314758f 100644
--- a/apps/openmw/mwclass/misc.hpp
+++ b/apps/openmw/mwclass/misc.hpp
@@ -7,6 +7,9 @@ namespace MWClass
 {
     class Miscellaneous : public MWWorld::Class
     {
+            virtual MWWorld::Ptr
+            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index a5525fcda..c81397753 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -380,4 +380,13 @@ namespace MWClass
         y = 0;
         x = 0;
     }
+
+    MWWorld::Ptr
+    Npc::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::NPC> *ref =
+            ptr.get<ESM::NPC>();
+
+        return MWWorld::Ptr(&cell.npcs.insert(*ref), &cell);
+    }
 }
diff --git a/apps/openmw/mwclass/npc.hpp b/apps/openmw/mwclass/npc.hpp
index 0ea45d132..46fdc9b04 100644
--- a/apps/openmw/mwclass/npc.hpp
+++ b/apps/openmw/mwclass/npc.hpp
@@ -9,6 +9,9 @@ namespace MWClass
     {
             void ensureCustomData (const MWWorld::Ptr& ptr) const;
 
+            virtual MWWorld::Ptr
+            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
             virtual std::string getId (const MWWorld::Ptr& ptr) const;
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index 92a951d03..e0f9008c4 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -160,4 +160,14 @@ namespace MWClass
         return boost::shared_ptr<MWWorld::Action> (
             new MWWorld::ActionApply (actor, ref->base->mId, actor));
     }
+
+    MWWorld::Ptr
+    Potion::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Potion> *ref =
+            ptr.get<ESM::Potion>();
+
+        return MWWorld::Ptr(&cell.potions.insert(*ref), &cell);
+    }
 }
+
diff --git a/apps/openmw/mwclass/potion.hpp b/apps/openmw/mwclass/potion.hpp
index 39edfd760..0cb40ead0 100644
--- a/apps/openmw/mwclass/potion.hpp
+++ b/apps/openmw/mwclass/potion.hpp
@@ -7,6 +7,9 @@ namespace MWClass
 {
     class Potion : public MWWorld::Class
     {
+            virtual MWWorld::Ptr
+            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index 033eee4c5..8e5fcfd19 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -164,4 +164,14 @@ namespace MWClass
 
         return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionEquip(ptr));
     }
+
+    MWWorld::Ptr
+    Probe::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Probe> *ref =
+            ptr.get<ESM::Probe>();
+
+        return MWWorld::Ptr(&cell.probes.insert(*ref), &cell);
+    }
 }
+
diff --git a/apps/openmw/mwclass/probe.hpp b/apps/openmw/mwclass/probe.hpp
index ff10eb9d6..67831d766 100644
--- a/apps/openmw/mwclass/probe.hpp
+++ b/apps/openmw/mwclass/probe.hpp
@@ -7,9 +7,12 @@ namespace MWClass
 {
     class Probe : public MWWorld::Class
     {
+            virtual MWWorld::Ptr
+            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
-             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
+            virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
             ///< Add reference into a cell for rendering
 
             virtual void insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const;
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index 4258ad106..84d6e3b9e 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -146,4 +146,13 @@ namespace MWClass
 
         return info;
     }
+
+    MWWorld::Ptr
+    Repair::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Repair> *ref =
+            ptr.get<ESM::Repair>();
+
+        return MWWorld::Ptr(&cell.repairs.insert(*ref), &cell);
+    }
 }
diff --git a/apps/openmw/mwclass/repair.hpp b/apps/openmw/mwclass/repair.hpp
index 689850b90..74d1d7378 100644
--- a/apps/openmw/mwclass/repair.hpp
+++ b/apps/openmw/mwclass/repair.hpp
@@ -7,9 +7,12 @@ namespace MWClass
 {
     class Repair : public MWWorld::Class
     {
+            virtual MWWorld::Ptr
+            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
-             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
+            virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
             ///< Add reference into a cell for rendering
 
             virtual void insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const;
diff --git a/apps/openmw/mwclass/static.cpp b/apps/openmw/mwclass/static.cpp
index a14adc300..ee8bcfe81 100644
--- a/apps/openmw/mwclass/static.cpp
+++ b/apps/openmw/mwclass/static.cpp
@@ -53,4 +53,13 @@ namespace MWClass
 
         registerClass (typeid (ESM::Static).name(), instance);
     }
+
+    MWWorld::Ptr
+    Static::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Static> *ref =
+            ptr.get<ESM::Static>();
+
+        return MWWorld::Ptr(&cell.statics.insert(*ref), &cell);
+    }
 }
diff --git a/apps/openmw/mwclass/static.hpp b/apps/openmw/mwclass/static.hpp
index 3066933e4..52b87abcd 100644
--- a/apps/openmw/mwclass/static.hpp
+++ b/apps/openmw/mwclass/static.hpp
@@ -7,6 +7,9 @@ namespace MWClass
 {
     class Static : public MWWorld::Class
     {
+            virtual MWWorld::Ptr
+            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index 6412a46b1..ccc5ff6ea 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -365,4 +365,13 @@ namespace MWClass
 
         return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionEquip(ptr));
     }
+
+    MWWorld::Ptr
+    Weapon::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Weapon> *ref =
+            ptr.get<ESM::Weapon>();
+
+        return MWWorld::Ptr(&cell.weapons.insert(*ref), &cell);
+    }
 }
diff --git a/apps/openmw/mwclass/weapon.hpp b/apps/openmw/mwclass/weapon.hpp
index eaf5b60a4..b18405488 100644
--- a/apps/openmw/mwclass/weapon.hpp
+++ b/apps/openmw/mwclass/weapon.hpp
@@ -7,6 +7,9 @@ namespace MWClass
 {
     class Weapon : public MWWorld::Class
     {
+            virtual MWWorld::Ptr
+            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 088c0c623..eceb5ddc1 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -8,8 +8,6 @@
 #include "../mwbase/world.hpp"
 
 #include "ptr.hpp"
-#include "manualref.hpp"
-#include "class.hpp"
 
 namespace MWWorld
 {
@@ -127,121 +125,4 @@ namespace MWWorld
             }
         }
     }
-
-    /// \todo this whole code needs major clean up
-    const MWWorld::Ptr CellStore::insertObject (const Ptr& ptr, const ESM::Position &pos)
-    {
-        std::string type = ptr.getTypeName();
-
-        MWWorld::Ptr newPtr;
-
-        // insert into the correct CellRefList
-        if      (type == typeid(ESM::Potion).name())
-        {
-            MWWorld::LiveCellRef<ESM::Potion>* ref = ptr.get<ESM::Potion>();
-            newPtr = MWWorld::Ptr(&potions.insert(*ref), this);
-        }
-        else if (type == typeid(ESM::Apparatus).name())
-        {
-            MWWorld::LiveCellRef<ESM::Apparatus>* ref = ptr.get<ESM::Apparatus>();
-            newPtr = MWWorld::Ptr(&appas.insert(*ref), this);
-        }
-        else if (type == typeid(ESM::Armor).name())
-        {
-            MWWorld::LiveCellRef<ESM::Armor>* ref = ptr.get<ESM::Armor>();
-            newPtr = MWWorld::Ptr(&armors.insert(*ref), this);
-        }
-        else if (type == typeid(ESM::Book).name())
-        {
-            MWWorld::LiveCellRef<ESM::Book>* ref = ptr.get<ESM::Book>();
-            newPtr = MWWorld::Ptr(&books.insert(*ref), this);
-        }
-        else if (type == typeid(ESM::Clothing).name())
-        {
-            MWWorld::LiveCellRef<ESM::Clothing>* ref = ptr.get<ESM::Clothing>();
-            newPtr = MWWorld::Ptr(&clothes.insert(*ref), this);
-        }
-        else if (type == typeid(ESM::Ingredient).name())
-        {
-            MWWorld::LiveCellRef<ESM::Ingredient>* ref = ptr.get<ESM::Ingredient>();
-            newPtr = MWWorld::Ptr(&ingreds.insert(*ref), this);
-        }
-        else if (type == typeid(ESM::Light).name())
-        {
-            MWWorld::LiveCellRef<ESM::Light>* ref = ptr.get<ESM::Light>();
-            newPtr = MWWorld::Ptr(&lights.insert(*ref), this);
-        }
-        else if (type == typeid(ESM::Tool).name())
-        {
-            MWWorld::LiveCellRef<ESM::Tool>* ref = ptr.get<ESM::Tool>();
-            newPtr = MWWorld::Ptr(&lockpicks.insert(*ref), this);
-        }
-        else if (type == typeid(ESM::Repair).name())
-        {
-            MWWorld::LiveCellRef<ESM::Repair>* ref = ptr.get<ESM::Repair>();
-            newPtr = MWWorld::Ptr(&repairs.insert(*ref), this);
-        }
-        else if (type == typeid(ESM::Probe).name())
-        {
-            MWWorld::LiveCellRef<ESM::Probe>* ref = ptr.get<ESM::Probe>();
-            newPtr = MWWorld::Ptr(&probes.insert(*ref), this);
-        }
-        else if (type == typeid(ESM::Weapon).name())
-        {
-            MWWorld::LiveCellRef<ESM::Weapon>* ref = ptr.get<ESM::Weapon>();
-            newPtr = MWWorld::Ptr(&weapons.insert(*ref), this);
-        }
-        else if (type == typeid(ESM::Miscellaneous).name())
-        {
-
-            // if this is gold, we need to fetch the correct mesh depending on the amount of gold.
-            if (MWWorld::Class::get(ptr).getName(ptr) == MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sGold")->str)
-            {
-                int goldAmount = ptr.getRefData().getCount();
-
-                std::string base = "Gold_001";
-                if (goldAmount >= 100)
-                    base = "Gold_100";
-                else if (goldAmount >= 25)
-                    base = "Gold_025";
-                else if (goldAmount >= 10)
-                    base = "Gold_010";
-                else if (goldAmount >= 5)
-                    base = "Gold_005";
-
-                MWWorld::ManualRef newRef(
-                    MWBase::Environment::get().getWorld()->getStore(),
-                    base);
-
-                MWWorld::LiveCellRef<ESM::Miscellaneous>* ref =
-                    newRef.getPtr().get<ESM::Miscellaneous>();
-
-                newPtr = MWWorld::Ptr(&miscItems.insert(*ref), this);
-            /*
-                ESM::Position& p = newPtr.getRefData().getPosition();
-                p.pos[0] = ptr.getRefData().getPosition().pos[0];
-                p.pos[1] = ptr.getRefData().getPosition().pos[1];
-                p.pos[2] = ptr.getRefData().getPosition().pos[2];
-            */
-            }
-            else
-            {
-                MWWorld::LiveCellRef<ESM::Miscellaneous>* ref =
-                    ptr.get<ESM::Miscellaneous>();
-
-                newPtr = MWWorld::Ptr(&miscItems.insert(*ref), this);
-            }
-        }
-        else
-            throw std::runtime_error("Trying to insert object of unhandled type");
-
-        newPtr.getRefData().getPosition() = pos;
-
-        newPtr.getRefData().setCount(ptr.getRefData().getCount());
-        ptr.getRefData().setCount(0);
-        newPtr.getRefData().enable();
-
-        return newPtr;
-    }
-
 }
diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index 1bf233a50..0be0ef651 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -113,9 +113,9 @@ namespace MWWorld
     CellRefList<ESM::Ingredient>        ingreds;
     CellRefList<ESM::CreatureLevList>   creatureLists;
     CellRefList<ESM::ItemLevList>       itemLists;
-    CellRefList<ESM::Light>        lights;
+    CellRefList<ESM::Light>             lights;
     CellRefList<ESM::Tool>              lockpicks;
-    CellRefList<ESM::Miscellaneous>              miscItems;
+    CellRefList<ESM::Miscellaneous>     miscItems;
     CellRefList<ESM::NPC>               npcs;
     CellRefList<ESM::Probe>             probes;
     CellRefList<ESM::Repair>            repairs;
@@ -155,8 +155,6 @@ namespace MWWorld
             forEachImp (functor, weapons);
     }
 
-    const MWWorld::Ptr insertObject(const MWWorld::Ptr &ptr, const ESM::Position &pos);
-
   private:
 
     template<class Functor, class List>
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 729746f6b..6f2306fbe 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -5,7 +5,10 @@
 
 #include <OgreVector3.h>
 
+#include <components/esm/defs.hpp>
+
 #include "ptr.hpp"
+#include "refdata.hpp"
 #include "nullaction.hpp"
 #include "containerstore.hpp"
 
@@ -217,4 +220,32 @@ namespace MWWorld
     {
         return "";
     }
+
+    MWWorld::Ptr
+    Class::moveToCellImpl(const Ptr &ptr, CellStore &cell) const
+    {
+        throw std::runtime_error("unable to move class to cell");
+    }
+
+    MWWorld::Ptr
+    Class::moveToCell(const Ptr &ptr, CellStore &cell) const
+    {
+        Ptr newPtr = moveToCellImpl(ptr, cell);
+
+        newPtr.getRefData().setCount(ptr.getRefData().getCount());
+        ptr.getRefData().setCount(0);
+        newPtr.getRefData().enable();
+
+        return newPtr;
+    }
+
+    MWWorld::Ptr
+    Class::moveToCell(const Ptr &ptr, CellStore &cell, const ESM::Position &pos) const
+    {
+        Ptr newPtr = moveToCell(ptr, cell);
+        newPtr.getRefData().getPosition() = pos;
+
+        return newPtr;
+    }
 }
+
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index c8b51eeab..509433433 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -31,12 +31,18 @@ namespace MWGui
     struct ToolTipInfo;
 }
 
+namespace ESM
+{
+    struct Position;
+}
+
 namespace MWWorld
 {
     class Ptr;
     class ContainerStore;
     class InventoryStore;
     class PhysicsSystem;
+    class CellStore;
 
     /// \brief Base class for referenceable esm records
     class Class
@@ -51,6 +57,8 @@ namespace MWWorld
 
             Class();
 
+            virtual Ptr moveToCellImpl(const Ptr &ptr, CellStore &cell) const;
+
         public:
 
             /// NPC-stances.
@@ -206,6 +214,12 @@ namespace MWWorld
             virtual void adjustRotation(const MWWorld::Ptr& ptr,float& x,float& y,float& z) const;
 
             virtual std::string getModel(const MWWorld::Ptr &ptr) const;
+
+            virtual Ptr
+            moveToCell(const Ptr &ptr, CellStore &cell) const;
+
+            virtual Ptr
+            moveToCell(const Ptr &ptr, CellStore &cell, const ESM::Position &pos) const;
     };
 }
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 19cdcc334..394a9e493 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1042,7 +1042,9 @@ namespace MWWorld
     {
         mLocalScripts.remove(object);
 
-        MWWorld::Ptr dropped = cell.insertObject(object, pos);
+        MWWorld::Ptr dropped =
+            MWWorld::Class::get(object).moveToCell(object, cell, pos);
+
         mWorldScene->addObjectToScene(dropped);
 
         std::string script = MWWorld::Class::get(dropped).getScript(dropped);

From 49b1d5e1275bfebcd508afb910d4d55644184c20 Mon Sep 17 00:00:00 2001
From: greye <greye@null.net>
Date: Wed, 25 Jul 2012 18:58:55 +0400
Subject: [PATCH 14/20] fix object placing

---
 apps/openmw/mwworld/physicssystem.cpp |  8 +++++---
 apps/openmw/mwworld/physicssystem.hpp |  2 +-
 apps/openmw/mwworld/scene.cpp         |  7 ++++++-
 libs/openengine/bullet/physic.cpp     | 17 +++++++++++++----
 libs/openengine/bullet/physic.hpp     |  2 +-
 5 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwworld/physicssystem.cpp b/apps/openmw/mwworld/physicssystem.cpp
index 2b3d4b0f4..e4a019b69 100644
--- a/apps/openmw/mwworld/physicssystem.cpp
+++ b/apps/openmw/mwworld/physicssystem.cpp
@@ -366,13 +366,15 @@ namespace MWWorld
         addActor (node->getName(), model, node->getPosition());
     }
 
-    float PhysicsSystem::getObjectHeight(const MWWorld::Ptr &ptr)
+    bool PhysicsSystem::getObjectAABB(const MWWorld::Ptr &ptr, float *min, float *max)
     {
         std::string model = MWWorld::Class::get(ptr).getModel(ptr);
         if (model.empty()) {
-            return 0.0;
+            return false;
         }
         float scale = ptr.getRefData().getBaseNode()->getScale().x;
-        return mEngine->getObjectHeight(model, scale);
+        mEngine->getObjectAABB(model, scale, min, max);
+
+        return true;
     }
 }
diff --git a/apps/openmw/mwworld/physicssystem.hpp b/apps/openmw/mwworld/physicssystem.hpp
index 61e2590bd..f81bcc373 100644
--- a/apps/openmw/mwworld/physicssystem.hpp
+++ b/apps/openmw/mwworld/physicssystem.hpp
@@ -65,7 +65,7 @@ namespace MWWorld
 
             void setCurrentWater(bool hasWater, int waterHeight);
 
-            float getObjectHeight(const MWWorld::Ptr &ptr);
+            bool getObjectAABB(const MWWorld::Ptr &ptr, float *min, float *max);
 
         private:
             OEngine::Render::OgreRenderer &mRender;
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index b78669ef5..ce0acfe47 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -337,7 +337,12 @@ namespace MWWorld
         mRendering.addObject (ptr);
 
         float *pos = ptr.getRefData().getPosition().pos;
-        pos[2] += mPhysics->getObjectHeight(ptr) / 2;
+        float min[3], max[3];
+        if (mPhysics->getObjectAABB(ptr, min, max)) {
+            pos[0] -= (min[0] + max[0]) / 2;
+            pos[1] -= (min[1] + max[1]) / 2;
+            pos[2] -= min[2];
+        }
 
         ptr.getRefData().getBaseNode()->setPosition(pos[0], pos[1], pos[2]);
 
diff --git a/libs/openengine/bullet/physic.cpp b/libs/openengine/bullet/physic.cpp
index 416d0c09d..611c87d9f 100644
--- a/libs/openengine/bullet/physic.cpp
+++ b/libs/openengine/bullet/physic.cpp
@@ -12,6 +12,8 @@
 
 #include <boost/lexical_cast.hpp>
 
+#include <stdio.h>
+
 #define BIT(x) (1<<(x))
 
 namespace OEngine {
@@ -569,7 +571,8 @@ namespace Physic
         return results2;
     }
 
-    float PhysicEngine::getObjectHeight(const std::string &mesh, float scale) {
+    void PhysicEngine::getObjectAABB(const std::string &mesh, float scale, float *min, float *max)
+    {
         char uniqueID[8];
         sprintf( uniqueID, "%07.3f", scale );
         std::string sid = uniqueID;
@@ -582,11 +585,17 @@ namespace Physic
 
         
         btTransform trans;
-        btVector3 min, max;
+        btVector3 btmin, btmax;
 
         trans.setIdentity();
-        shape->Shape->getAabb(trans, min, max);
+        shape->Shape->getAabb(trans, btmin, btmax);
 
-        return max.z() - min.z();
+        min[0] = btmin.x();
+        min[1] = btmin.y();
+        min[2] = btmin.z();
+
+        max[0] = btmax.x();
+        max[1] = btmax.y();
+        max[2] = btmax.z();
     }
 }};
diff --git a/libs/openengine/bullet/physic.hpp b/libs/openengine/bullet/physic.hpp
index 22c5fa274..8701adc84 100644
--- a/libs/openengine/bullet/physic.hpp
+++ b/libs/openengine/bullet/physic.hpp
@@ -221,7 +221,7 @@ namespace Physic
 
         bool toggleDebugRendering();
 
-        float getObjectHeight(const std::string &mesh, float scale);
+        void getObjectAABB(const std::string &mesh, float scale, float *min, float *max);
 
         /**
          * Return the closest object hit by a ray. If there are no objects, it will return ("",-1).

From cd04911f3c463ce6e8eb94f62020ee689b661c4f Mon Sep 17 00:00:00 2001
From: greye <greye@null.net>
Date: Wed, 25 Jul 2012 20:25:53 +0400
Subject: [PATCH 15/20] dropping on the ground

---
 apps/openmw/mwworld/physicssystem.cpp | 16 ++++++++++++++++
 apps/openmw/mwworld/physicssystem.hpp |  3 +++
 apps/openmw/mwworld/worldimp.cpp      | 13 ++++++++++++-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/physicssystem.cpp b/apps/openmw/mwworld/physicssystem.cpp
index e4a019b69..27d48fa39 100644
--- a/apps/openmw/mwworld/physicssystem.cpp
+++ b/apps/openmw/mwworld/physicssystem.cpp
@@ -122,6 +122,22 @@ namespace MWWorld
         return !(result.first == "");
     }
 
+    std::pair<bool, Ogre::Vector3>
+    PhysicsSystem::castRay(const Ogre::Vector3 &orig, const Ogre::Vector3 &dir, float len)
+    {
+        Ogre::Ray ray = Ogre::Ray(orig, dir);
+        Ogre::Vector3 to = ray.getPoint(len);
+
+        btVector3 btFrom = btVector3(orig.x, orig.y, orig.z);
+        btVector3 btTo = btVector3(to.x, to.y, to.z);
+
+        std::pair<std::string, float> test = mEngine->rayTest(btFrom, btTo);
+        if (test.first == "") {
+            return std::make_pair(false, Ogre::Vector3());
+        }
+        return std::make_pair(true, ray.getPoint(len * test.second));
+    }
+
     std::pair<bool, Ogre::Vector3> PhysicsSystem::castRay(float mouseX, float mouseY)
     {
         Ogre::Ray ray = mRender.getCamera()->getCameraToViewportRay(
diff --git a/apps/openmw/mwworld/physicssystem.hpp b/apps/openmw/mwworld/physicssystem.hpp
index f81bcc373..375a7c9de 100644
--- a/apps/openmw/mwworld/physicssystem.hpp
+++ b/apps/openmw/mwworld/physicssystem.hpp
@@ -54,6 +54,9 @@ namespace MWWorld
             // cast ray, return true if it hit something
             bool castRay(const Ogre::Vector3& from, const Ogre::Vector3& to);
 
+            std::pair<bool, Ogre::Vector3>
+            castRay(const Ogre::Vector3 &orig, const Ogre::Vector3 &dir, float len);
+
             std::pair<bool, Ogre::Vector3> castRay(float mouseX, float mouseY);
             ///< cast ray from the mouse, return true if it hit something and the first result (in OGRE coordinates)
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 394a9e493..b9ab6ade2 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1057,9 +1057,20 @@ namespace MWWorld
     {
         MWWorld::Ptr::CellStore* cell = getPlayer().getPlayer().getCell();
 
-        ESM::Position &pos =
+        ESM::Position pos =
             getPlayer().getPlayer().getRefData().getPosition();
 
+        Ogre::Vector3 orig =
+            Ogre::Vector3(pos.pos[0], pos.pos[1], pos.pos[2]);
+        Ogre::Vector3 dir = Ogre::Vector3(0, 0, -1);
+        
+        float len = (pos.pos[2] >= 0) ? pos.pos[2] : -pos.pos[2];
+        len += 100.0;
+
+        std::pair<bool, Ogre::Vector3> hit =
+            mPhysics->castRay(orig, dir, len);
+        pos.pos[2] = hit.second.z;
+
         /// \todo fix item dropping at player object center position
         placeObject(object, *cell, pos);
     }

From 9f813aa26c3ed3a31767f1b75d637027b2fb47b4 Mon Sep 17 00:00:00 2001
From: greye <greye@null.net>
Date: Wed, 25 Jul 2012 23:28:42 +0400
Subject: [PATCH 16/20] update resource naming in getObjectAABB()

---
 libs/openengine/bullet/physic.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libs/openengine/bullet/physic.cpp b/libs/openengine/bullet/physic.cpp
index 611c87d9f..d4b63676d 100644
--- a/libs/openengine/bullet/physic.cpp
+++ b/libs/openengine/bullet/physic.cpp
@@ -12,8 +12,6 @@
 
 #include <boost/lexical_cast.hpp>
 
-#include <stdio.h>
-
 #define BIT(x) (1<<(x))
 
 namespace OEngine {
@@ -576,14 +574,13 @@ namespace Physic
         char uniqueID[8];
         sprintf( uniqueID, "%07.3f", scale );
         std::string sid = uniqueID;
-        std::string outputstring = mesh + uniqueID + "\"|";
+        std::string outputstring = mesh + uniqueID;
 
         mShapeLoader->load(outputstring, "General");
         BulletShapeManager::getSingletonPtr()->load(outputstring, "General");
         BulletShapePtr shape =
             BulletShapeManager::getSingleton().getByName(outputstring, "General");
 
-        
         btTransform trans;
         btVector3 btmin, btmax;
 

From 26595f22f66efcb84c97b3fd7baac9eb03895e24 Mon Sep 17 00:00:00 2001
From: greye <greye@null.net>
Date: Thu, 26 Jul 2012 16:14:11 +0400
Subject: [PATCH 17/20] float* -> Vector3, moveToCell -> copyToCell, fixed
 placeObject()

---
 apps/openmw/mwclass/activator.cpp     |  2 +-
 apps/openmw/mwclass/activator.hpp     |  2 +-
 apps/openmw/mwclass/apparatus.cpp     |  2 +-
 apps/openmw/mwclass/apparatus.hpp     |  2 +-
 apps/openmw/mwclass/armor.cpp         |  2 +-
 apps/openmw/mwclass/armor.hpp         |  2 +-
 apps/openmw/mwclass/book.cpp          |  2 +-
 apps/openmw/mwclass/book.hpp          |  2 +-
 apps/openmw/mwclass/clothing.cpp      |  2 +-
 apps/openmw/mwclass/clothing.hpp      |  2 +-
 apps/openmw/mwclass/container.cpp     |  2 +-
 apps/openmw/mwclass/container.hpp     |  2 +-
 apps/openmw/mwclass/creature.cpp      |  2 +-
 apps/openmw/mwclass/creature.hpp      |  2 +-
 apps/openmw/mwclass/door.cpp          |  2 +-
 apps/openmw/mwclass/door.hpp          |  2 +-
 apps/openmw/mwclass/ingredient.cpp    |  2 +-
 apps/openmw/mwclass/ingredient.hpp    |  2 +-
 apps/openmw/mwclass/light.cpp         |  2 +-
 apps/openmw/mwclass/light.hpp         |  2 +-
 apps/openmw/mwclass/lockpick.cpp      |  2 +-
 apps/openmw/mwclass/lockpick.hpp      |  2 +-
 apps/openmw/mwclass/misc.cpp          |  2 +-
 apps/openmw/mwclass/misc.hpp          |  2 +-
 apps/openmw/mwclass/npc.cpp           |  2 +-
 apps/openmw/mwclass/npc.hpp           |  2 +-
 apps/openmw/mwclass/potion.cpp        |  2 +-
 apps/openmw/mwclass/potion.hpp        |  2 +-
 apps/openmw/mwclass/probe.cpp         |  2 +-
 apps/openmw/mwclass/probe.hpp         |  2 +-
 apps/openmw/mwclass/repair.cpp        |  2 +-
 apps/openmw/mwclass/repair.hpp        |  2 +-
 apps/openmw/mwclass/static.cpp        |  2 +-
 apps/openmw/mwclass/static.hpp        |  2 +-
 apps/openmw/mwclass/weapon.cpp        |  2 +-
 apps/openmw/mwclass/weapon.hpp        |  2 +-
 apps/openmw/mwworld/class.cpp         | 11 +++++----
 apps/openmw/mwworld/class.hpp         |  6 ++---
 apps/openmw/mwworld/physicssystem.cpp | 15 ++++++++++---
 apps/openmw/mwworld/physicssystem.hpp |  2 +-
 apps/openmw/mwworld/scene.cpp         | 32 +++++++++++++++------------
 apps/openmw/mwworld/scene.hpp         |  2 ++
 apps/openmw/mwworld/worldimp.cpp      | 26 +++++++++++++++-------
 libs/openengine/bullet/physic.cpp     | 13 ++---------
 libs/openengine/bullet/physic.hpp     |  2 +-
 45 files changed, 98 insertions(+), 83 deletions(-)

diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index d0f09e80e..9b0082efc 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -96,7 +96,7 @@ namespace MWClass
     }
 
     MWWorld::Ptr
-    Activator::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    Activator::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
     {
         MWWorld::LiveCellRef<ESM::Activator> *ref =
             ptr.get<ESM::Activator>();
diff --git a/apps/openmw/mwclass/activator.hpp b/apps/openmw/mwclass/activator.hpp
index 26aafb717..4165fbc08 100644
--- a/apps/openmw/mwclass/activator.hpp
+++ b/apps/openmw/mwclass/activator.hpp
@@ -9,7 +9,7 @@ namespace MWClass
     {
 
             virtual MWWorld::Ptr
-            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
 
         public:
 
diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index 6322c963e..9814b140c 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -151,7 +151,7 @@ namespace MWClass
     }
 
     MWWorld::Ptr
-    Apparatus::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    Apparatus::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
     {
         MWWorld::LiveCellRef<ESM::Apparatus> *ref =
             ptr.get<ESM::Apparatus>();
diff --git a/apps/openmw/mwclass/apparatus.hpp b/apps/openmw/mwclass/apparatus.hpp
index 9352e0617..7045f62d6 100644
--- a/apps/openmw/mwclass/apparatus.hpp
+++ b/apps/openmw/mwclass/apparatus.hpp
@@ -9,7 +9,7 @@ namespace MWClass
     {
 
             virtual MWWorld::Ptr
-            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
 
         public:
 
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index aeefcd42b..4624b94d9 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -278,7 +278,7 @@ namespace MWClass
     }
 
     MWWorld::Ptr
-    Armor::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    Armor::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
     {
         MWWorld::LiveCellRef<ESM::Armor> *ref =
             ptr.get<ESM::Armor>();
diff --git a/apps/openmw/mwclass/armor.hpp b/apps/openmw/mwclass/armor.hpp
index 960b6dad5..51c0ea21c 100644
--- a/apps/openmw/mwclass/armor.hpp
+++ b/apps/openmw/mwclass/armor.hpp
@@ -8,7 +8,7 @@ namespace MWClass
     class Armor : public MWWorld::Class
     {
             virtual MWWorld::Ptr
-            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
 
         public:
 
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index 1517f090a..d8166347e 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -158,7 +158,7 @@ namespace MWClass
     }
 
     MWWorld::Ptr
-    Book::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    Book::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
     {
         MWWorld::LiveCellRef<ESM::Book> *ref =
             ptr.get<ESM::Book>();
diff --git a/apps/openmw/mwclass/book.hpp b/apps/openmw/mwclass/book.hpp
index adbf2d64b..acb1aac06 100644
--- a/apps/openmw/mwclass/book.hpp
+++ b/apps/openmw/mwclass/book.hpp
@@ -8,7 +8,7 @@ namespace MWClass
     class Book : public MWWorld::Class
     {
             virtual MWWorld::Ptr
-            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
 
         public:
 
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index 86c031db0..f55d6ed88 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -229,7 +229,7 @@ namespace MWClass
     }
 
     MWWorld::Ptr
-    Clothing::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    Clothing::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
     {
         MWWorld::LiveCellRef<ESM::Clothing> *ref =
             ptr.get<ESM::Clothing>();
diff --git a/apps/openmw/mwclass/clothing.hpp b/apps/openmw/mwclass/clothing.hpp
index 2c0d0b8a5..f7801848f 100644
--- a/apps/openmw/mwclass/clothing.hpp
+++ b/apps/openmw/mwclass/clothing.hpp
@@ -8,7 +8,7 @@ namespace MWClass
     class Clothing : public MWWorld::Class
     {
             virtual MWWorld::Ptr
-            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
 
         public:
 
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 2543f6acd..c6d22b3a5 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -209,7 +209,7 @@ namespace MWClass
     }
 
     MWWorld::Ptr
-    Container::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    Container::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
     {
         MWWorld::LiveCellRef<ESM::Container> *ref =
             ptr.get<ESM::Container>();
diff --git a/apps/openmw/mwclass/container.hpp b/apps/openmw/mwclass/container.hpp
index 2f15d03d8..006e4bd22 100644
--- a/apps/openmw/mwclass/container.hpp
+++ b/apps/openmw/mwclass/container.hpp
@@ -11,7 +11,7 @@ namespace MWClass
 
 
             virtual MWWorld::Ptr
-            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
 
         public:
 
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 8f885bf62..0f3141f5c 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -197,7 +197,7 @@ namespace MWClass
     }
 
     MWWorld::Ptr
-    Creature::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    Creature::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
     {
         MWWorld::LiveCellRef<ESM::Creature> *ref =
             ptr.get<ESM::Creature>();
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index 38be98533..f7a5e5874 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -12,7 +12,7 @@ namespace MWClass
             void ensureCustomData (const MWWorld::Ptr& ptr) const;
 
             virtual MWWorld::Ptr
-            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
 
         public:
 
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 8eef54725..359e50ffb 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -211,7 +211,7 @@ namespace MWClass
     }
 
     MWWorld::Ptr
-    Door::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    Door::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
     {
         MWWorld::LiveCellRef<ESM::Door> *ref =
             ptr.get<ESM::Door>();
diff --git a/apps/openmw/mwclass/door.hpp b/apps/openmw/mwclass/door.hpp
index b89858556..b0f86f12d 100644
--- a/apps/openmw/mwclass/door.hpp
+++ b/apps/openmw/mwclass/door.hpp
@@ -8,7 +8,7 @@ namespace MWClass
     class Door : public MWWorld::Class
     {
             virtual MWWorld::Ptr
-            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
 
         public:
 
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index 02e77fa25..d8c8b4b3b 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -158,7 +158,7 @@ namespace MWClass
     }
 
     MWWorld::Ptr
-    Ingredient::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    Ingredient::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
     {
         MWWorld::LiveCellRef<ESM::Ingredient> *ref =
             ptr.get<ESM::Ingredient>();
diff --git a/apps/openmw/mwclass/ingredient.hpp b/apps/openmw/mwclass/ingredient.hpp
index 44ee0ccd0..1365c4a71 100644
--- a/apps/openmw/mwclass/ingredient.hpp
+++ b/apps/openmw/mwclass/ingredient.hpp
@@ -8,7 +8,7 @@ namespace MWClass
     class Ingredient : public MWWorld::Class
     {
             virtual MWWorld::Ptr
-            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
 
         public:
 
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index e7b3af2b9..f09d3ce36 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -198,7 +198,7 @@ namespace MWClass
     }
 
     MWWorld::Ptr
-    Light::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    Light::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
     {
         MWWorld::LiveCellRef<ESM::Light> *ref =
             ptr.get<ESM::Light>();
diff --git a/apps/openmw/mwclass/light.hpp b/apps/openmw/mwclass/light.hpp
index 953078a35..640e1705b 100644
--- a/apps/openmw/mwclass/light.hpp
+++ b/apps/openmw/mwclass/light.hpp
@@ -8,7 +8,7 @@ namespace MWClass
     class Light : public MWWorld::Class
     {
             virtual MWWorld::Ptr
-            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
 
         public:
 
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index e72e96822..20441b520 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -167,7 +167,7 @@ namespace MWClass
     }
 
     MWWorld::Ptr
-    Lockpick::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    Lockpick::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
     {
         MWWorld::LiveCellRef<ESM::Tool> *ref =
             ptr.get<ESM::Tool>();
diff --git a/apps/openmw/mwclass/lockpick.hpp b/apps/openmw/mwclass/lockpick.hpp
index 216dc10c9..0961b55b2 100644
--- a/apps/openmw/mwclass/lockpick.hpp
+++ b/apps/openmw/mwclass/lockpick.hpp
@@ -8,7 +8,7 @@ namespace MWClass
     class Lockpick : public MWWorld::Class
     {
             virtual MWWorld::Ptr
-            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
 
         public:
 
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index 37f608ed2..cb6d40c43 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -186,7 +186,7 @@ namespace MWClass
     }
 
     MWWorld::Ptr
-    Miscellaneous::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    Miscellaneous::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
     {
         MWWorld::Ptr newPtr;
         
diff --git a/apps/openmw/mwclass/misc.hpp b/apps/openmw/mwclass/misc.hpp
index 2a314758f..a5a79a8f6 100644
--- a/apps/openmw/mwclass/misc.hpp
+++ b/apps/openmw/mwclass/misc.hpp
@@ -8,7 +8,7 @@ namespace MWClass
     class Miscellaneous : public MWWorld::Class
     {
             virtual MWWorld::Ptr
-            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
 
         public:
 
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index c81397753..81c0c85f5 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -382,7 +382,7 @@ namespace MWClass
     }
 
     MWWorld::Ptr
-    Npc::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    Npc::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
     {
         MWWorld::LiveCellRef<ESM::NPC> *ref =
             ptr.get<ESM::NPC>();
diff --git a/apps/openmw/mwclass/npc.hpp b/apps/openmw/mwclass/npc.hpp
index 46fdc9b04..e494fbaa7 100644
--- a/apps/openmw/mwclass/npc.hpp
+++ b/apps/openmw/mwclass/npc.hpp
@@ -10,7 +10,7 @@ namespace MWClass
             void ensureCustomData (const MWWorld::Ptr& ptr) const;
 
             virtual MWWorld::Ptr
-            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
 
         public:
 
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index e0f9008c4..993dac6f6 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -162,7 +162,7 @@ namespace MWClass
     }
 
     MWWorld::Ptr
-    Potion::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    Potion::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
     {
         MWWorld::LiveCellRef<ESM::Potion> *ref =
             ptr.get<ESM::Potion>();
diff --git a/apps/openmw/mwclass/potion.hpp b/apps/openmw/mwclass/potion.hpp
index 0cb40ead0..d595f7e69 100644
--- a/apps/openmw/mwclass/potion.hpp
+++ b/apps/openmw/mwclass/potion.hpp
@@ -8,7 +8,7 @@ namespace MWClass
     class Potion : public MWWorld::Class
     {
             virtual MWWorld::Ptr
-            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
 
         public:
 
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index 8e5fcfd19..450016209 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -166,7 +166,7 @@ namespace MWClass
     }
 
     MWWorld::Ptr
-    Probe::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    Probe::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
     {
         MWWorld::LiveCellRef<ESM::Probe> *ref =
             ptr.get<ESM::Probe>();
diff --git a/apps/openmw/mwclass/probe.hpp b/apps/openmw/mwclass/probe.hpp
index 67831d766..d9f90baf6 100644
--- a/apps/openmw/mwclass/probe.hpp
+++ b/apps/openmw/mwclass/probe.hpp
@@ -8,7 +8,7 @@ namespace MWClass
     class Probe : public MWWorld::Class
     {
             virtual MWWorld::Ptr
-            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
 
         public:
 
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index 84d6e3b9e..829fe311a 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -148,7 +148,7 @@ namespace MWClass
     }
 
     MWWorld::Ptr
-    Repair::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    Repair::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
     {
         MWWorld::LiveCellRef<ESM::Repair> *ref =
             ptr.get<ESM::Repair>();
diff --git a/apps/openmw/mwclass/repair.hpp b/apps/openmw/mwclass/repair.hpp
index 74d1d7378..c58e38f96 100644
--- a/apps/openmw/mwclass/repair.hpp
+++ b/apps/openmw/mwclass/repair.hpp
@@ -8,7 +8,7 @@ namespace MWClass
     class Repair : public MWWorld::Class
     {
             virtual MWWorld::Ptr
-            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
 
         public:
 
diff --git a/apps/openmw/mwclass/static.cpp b/apps/openmw/mwclass/static.cpp
index ee8bcfe81..e317b740c 100644
--- a/apps/openmw/mwclass/static.cpp
+++ b/apps/openmw/mwclass/static.cpp
@@ -55,7 +55,7 @@ namespace MWClass
     }
 
     MWWorld::Ptr
-    Static::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    Static::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
     {
         MWWorld::LiveCellRef<ESM::Static> *ref =
             ptr.get<ESM::Static>();
diff --git a/apps/openmw/mwclass/static.hpp b/apps/openmw/mwclass/static.hpp
index 52b87abcd..e36b3d142 100644
--- a/apps/openmw/mwclass/static.hpp
+++ b/apps/openmw/mwclass/static.hpp
@@ -8,7 +8,7 @@ namespace MWClass
     class Static : public MWWorld::Class
     {
             virtual MWWorld::Ptr
-            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
 
         public:
 
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index ccc5ff6ea..b45953130 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -367,7 +367,7 @@ namespace MWClass
     }
 
     MWWorld::Ptr
-    Weapon::moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    Weapon::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
     {
         MWWorld::LiveCellRef<ESM::Weapon> *ref =
             ptr.get<ESM::Weapon>();
diff --git a/apps/openmw/mwclass/weapon.hpp b/apps/openmw/mwclass/weapon.hpp
index b18405488..06cf88c5f 100644
--- a/apps/openmw/mwclass/weapon.hpp
+++ b/apps/openmw/mwclass/weapon.hpp
@@ -8,7 +8,7 @@ namespace MWClass
     class Weapon : public MWWorld::Class
     {
             virtual MWWorld::Ptr
-            moveToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
 
         public:
 
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 6f2306fbe..6676ce1cf 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -222,27 +222,26 @@ namespace MWWorld
     }
 
     MWWorld::Ptr
-    Class::moveToCellImpl(const Ptr &ptr, CellStore &cell) const
+    Class::copyToCellImpl(const Ptr &ptr, CellStore &cell) const
     {
         throw std::runtime_error("unable to move class to cell");
     }
 
     MWWorld::Ptr
-    Class::moveToCell(const Ptr &ptr, CellStore &cell) const
+    Class::copyToCell(const Ptr &ptr, CellStore &cell) const
     {
-        Ptr newPtr = moveToCellImpl(ptr, cell);
+        Ptr newPtr = copyToCellImpl(ptr, cell);
 
         newPtr.getRefData().setCount(ptr.getRefData().getCount());
-        ptr.getRefData().setCount(0);
         newPtr.getRefData().enable();
 
         return newPtr;
     }
 
     MWWorld::Ptr
-    Class::moveToCell(const Ptr &ptr, CellStore &cell, const ESM::Position &pos) const
+    Class::copyToCell(const Ptr &ptr, CellStore &cell, const ESM::Position &pos) const
     {
-        Ptr newPtr = moveToCell(ptr, cell);
+        Ptr newPtr = copyToCell(ptr, cell);
         newPtr.getRefData().getPosition() = pos;
 
         return newPtr;
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 509433433..1bc592798 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -57,7 +57,7 @@ namespace MWWorld
 
             Class();
 
-            virtual Ptr moveToCellImpl(const Ptr &ptr, CellStore &cell) const;
+            virtual Ptr copyToCellImpl(const Ptr &ptr, CellStore &cell) const;
 
         public:
 
@@ -216,10 +216,10 @@ namespace MWWorld
             virtual std::string getModel(const MWWorld::Ptr &ptr) const;
 
             virtual Ptr
-            moveToCell(const Ptr &ptr, CellStore &cell) const;
+            copyToCell(const Ptr &ptr, CellStore &cell) const;
 
             virtual Ptr
-            moveToCell(const Ptr &ptr, CellStore &cell, const ESM::Position &pos) const;
+            copyToCell(const Ptr &ptr, CellStore &cell, const ESM::Position &pos) const;
     };
 }
 
diff --git a/apps/openmw/mwworld/physicssystem.cpp b/apps/openmw/mwworld/physicssystem.cpp
index 27d48fa39..45cfdd123 100644
--- a/apps/openmw/mwworld/physicssystem.cpp
+++ b/apps/openmw/mwworld/physicssystem.cpp
@@ -382,14 +382,23 @@ namespace MWWorld
         addActor (node->getName(), model, node->getPosition());
     }
 
-    bool PhysicsSystem::getObjectAABB(const MWWorld::Ptr &ptr, float *min, float *max)
+    bool PhysicsSystem::getObjectAABB(const MWWorld::Ptr &ptr, Ogre::Vector3 &min, Ogre::Vector3 &max)
     {
         std::string model = MWWorld::Class::get(ptr).getModel(ptr);
         if (model.empty()) {
             return false;
         }
-        float scale = ptr.getRefData().getBaseNode()->getScale().x;
-        mEngine->getObjectAABB(model, scale, min, max);
+        btVector3 btMin, btMax;
+        float scale = ptr.getCellRef().scale;
+        mEngine->getObjectAABB(model, scale, btMin, btMax);
+
+        min.x = btMin.x();
+        min.y = btMin.y();
+        min.z = btMin.z();
+
+        max.x = btMax.x();
+        max.y = btMax.y();
+        max.z = btMax.z();
 
         return true;
     }
diff --git a/apps/openmw/mwworld/physicssystem.hpp b/apps/openmw/mwworld/physicssystem.hpp
index 375a7c9de..e42fa536b 100644
--- a/apps/openmw/mwworld/physicssystem.hpp
+++ b/apps/openmw/mwworld/physicssystem.hpp
@@ -68,7 +68,7 @@ namespace MWWorld
 
             void setCurrentWater(bool hasWater, int waterHeight);
 
-            bool getObjectAABB(const MWWorld::Ptr &ptr, float *min, float *max);
+            bool getObjectAABB(const MWWorld::Ptr &ptr, Ogre::Vector3 &min, Ogre::Vector3 &max);
 
         private:
             OEngine::Render::OgreRenderer &mRender;
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index ce0acfe47..13e5ecb85 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -334,21 +334,10 @@ namespace MWWorld
 
     void Scene::addObjectToScene (const Ptr& ptr)
     {
-        mRendering.addObject (ptr);
-
-        float *pos = ptr.getRefData().getPosition().pos;
-        float min[3], max[3];
-        if (mPhysics->getObjectAABB(ptr, min, max)) {
-            pos[0] -= (min[0] + max[0]) / 2;
-            pos[1] -= (min[1] + max[1]) / 2;
-            pos[2] -= min[2];
-        }
-
-        ptr.getRefData().getBaseNode()->setPosition(pos[0], pos[1], pos[2]);
-
-        MWWorld::Class::get (ptr).insertObject (ptr, *mPhysics);
+        mRendering.addObject(ptr);
+        MWWorld::Class::get(ptr).insertObject(ptr, *mPhysics);
     }
-
+   
     void Scene::removeObjectFromScene (const Ptr& ptr)
     {
         MWBase::Environment::get().getMechanicsManager()->removeActor (ptr);
@@ -356,4 +345,19 @@ namespace MWWorld
         mPhysics->removeObject (ptr.getRefData().getHandle());
         mRendering.removeObject (ptr);
     }
+
+    bool Scene::isCellActive(const CellStore &cell)
+    {
+        CellStoreCollection::iterator active = mActiveCells.begin();
+        while (active != mActiveCells.end()) {
+            if ((*active)->cell->name == cell.cell->name &&
+                (*active)->cell->data.gridX == cell.cell->data.gridX &&
+                (*active)->cell->data.gridY == cell.cell->data.gridY)
+            {
+                return true;
+            }
+            ++active;
+        }
+        return false;
+    }
 }
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index f5f4b640b..59e13dafe 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -95,6 +95,8 @@ namespace MWWorld
 
             void removeObjectFromScene (const Ptr& ptr);
             ///< Remove an object from the scene, but not from the world model.
+
+            bool isCellActive(const CellStore &cell);
     };
 }
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index b9ab6ade2..59f6d7e86 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1022,6 +1022,7 @@ namespace MWWorld
         pos.pos[2] = result.second[1];
 
         placeObject(object, *cell, pos);
+        object.getRefData().setCount(0);
 
         return true;
     }
@@ -1040,16 +1041,25 @@ namespace MWWorld
     void
     World::placeObject(const Ptr &object, CellStore &cell, const ESM::Position &pos)
     {
-        mLocalScripts.remove(object);
-
+        /// \todo add searching correct cell for position specified
         MWWorld::Ptr dropped =
-            MWWorld::Class::get(object).moveToCell(object, cell, pos);
+            MWWorld::Class::get(object).copyToCell(object, cell, pos);
 
-        mWorldScene->addObjectToScene(dropped);
+        Ogre::Vector3 min, max;
+        if (mPhysics->getObjectAABB(object, min, max)) {
+            float *pos = dropped.getRefData().getPosition().pos;
+            pos[0] -= (min.x + max.x) / 2;
+            pos[1] -= (min.y + max.y) / 2;
+            pos[2] -= min.z;
+        }
 
-        std::string script = MWWorld::Class::get(dropped).getScript(dropped);
-        if (!script.empty()) {
-            mLocalScripts.add(script, dropped);
+        if (mWorldScene->isCellActive(cell)) {
+            mWorldScene->addObjectToScene(dropped);
+
+            std::string script = MWWorld::Class::get(dropped).getScript(dropped);
+            if (!script.empty()) {
+                mLocalScripts.add(script, dropped);
+            }
         }
     }
 
@@ -1071,8 +1081,8 @@ namespace MWWorld
             mPhysics->castRay(orig, dir, len);
         pos.pos[2] = hit.second.z;
 
-        /// \todo fix item dropping at player object center position
         placeObject(object, *cell, pos);
+        object.getRefData().setCount(0);
     }
 
     void World::processChangedSettings(const Settings::CategorySettingVector& settings)
diff --git a/libs/openengine/bullet/physic.cpp b/libs/openengine/bullet/physic.cpp
index d4b63676d..089825a9d 100644
--- a/libs/openengine/bullet/physic.cpp
+++ b/libs/openengine/bullet/physic.cpp
@@ -569,7 +569,7 @@ namespace Physic
         return results2;
     }
 
-    void PhysicEngine::getObjectAABB(const std::string &mesh, float scale, float *min, float *max)
+    void PhysicEngine::getObjectAABB(const std::string &mesh, float scale, btVector3 &min, btVector3 &max)
     {
         char uniqueID[8];
         sprintf( uniqueID, "%07.3f", scale );
@@ -582,17 +582,8 @@ namespace Physic
             BulletShapeManager::getSingleton().getByName(outputstring, "General");
 
         btTransform trans;
-        btVector3 btmin, btmax;
-
         trans.setIdentity();
-        shape->Shape->getAabb(trans, btmin, btmax);
 
-        min[0] = btmin.x();
-        min[1] = btmin.y();
-        min[2] = btmin.z();
-
-        max[0] = btmax.x();
-        max[1] = btmax.y();
-        max[2] = btmax.z();
+        shape->Shape->getAabb(trans, min, max);
     }
 }};
diff --git a/libs/openengine/bullet/physic.hpp b/libs/openengine/bullet/physic.hpp
index 8701adc84..9ae8e7607 100644
--- a/libs/openengine/bullet/physic.hpp
+++ b/libs/openengine/bullet/physic.hpp
@@ -221,7 +221,7 @@ namespace Physic
 
         bool toggleDebugRendering();
 
-        void getObjectAABB(const std::string &mesh, float scale, float *min, float *max);
+        void getObjectAABB(const std::string &mesh, float scale, btVector3 &min, btVector3 &max);
 
         /**
          * Return the closest object hit by a ray. If there are no objects, it will return ("",-1).

From aa5f63ffcc2f3bc52b27c13e84f938f303b98a34 Mon Sep 17 00:00:00 2001
From: greye <greye@null.net>
Date: Thu, 26 Jul 2012 19:06:48 +0400
Subject: [PATCH 18/20] disabled items placing handling

---
 apps/openmw/mwworld/class.cpp    | 6 +++++-
 apps/openmw/mwworld/worldimp.cpp | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 6676ce1cf..bb9b7d982 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -233,7 +233,11 @@ namespace MWWorld
         Ptr newPtr = copyToCellImpl(ptr, cell);
 
         newPtr.getRefData().setCount(ptr.getRefData().getCount());
-        newPtr.getRefData().enable();
+        if (ptr.getRefData().isEnabled()) {
+            newPtr.getRefData().enable();
+        } else {
+            newPtr.getRefData().disable();
+        }
 
         return newPtr;
     }
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 59f6d7e86..67d8a7cec 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1054,8 +1054,9 @@ namespace MWWorld
         }
 
         if (mWorldScene->isCellActive(cell)) {
-            mWorldScene->addObjectToScene(dropped);
-
+            if (dropped.getRefData().isEnabled()) {
+                mWorldScene->addObjectToScene(dropped);
+            }
             std::string script = MWWorld::Class::get(dropped).getScript(dropped);
             if (!script.empty()) {
                 mLocalScripts.add(script, dropped);

From d5e63a767ec05360cc7fdd974fe486140a1fa3cf Mon Sep 17 00:00:00 2001
From: greye <greye@null.net>
Date: Thu, 26 Jul 2012 19:38:33 +0400
Subject: [PATCH 19/20] replace sprintf() with boost::format

---
 libs/openengine/bullet/physic.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/libs/openengine/bullet/physic.cpp b/libs/openengine/bullet/physic.cpp
index 089825a9d..a778aef3a 100644
--- a/libs/openengine/bullet/physic.cpp
+++ b/libs/openengine/bullet/physic.cpp
@@ -11,6 +11,7 @@
 #include "BtOgreExtras.h"
 
 #include <boost/lexical_cast.hpp>
+#include <boost/format.hpp>
 
 #define BIT(x) (1<<(x))
 
@@ -333,10 +334,8 @@ namespace Physic
 
     RigidBody* PhysicEngine::createRigidBody(std::string mesh,std::string name,float scale)
     {
-        char uniqueID[8];
-        sprintf( uniqueID, "%07.3f", scale );
-        std::string sid = uniqueID;
-        std::string outputstring = mesh + uniqueID;
+        std::string sid = (boost::format("%07.3f") % scale).str();
+        std::string outputstring = mesh + sid;
         //std::cout << "The string" << outputstring << "\n";
 
         //get the shape from the .nif
@@ -571,10 +570,8 @@ namespace Physic
 
     void PhysicEngine::getObjectAABB(const std::string &mesh, float scale, btVector3 &min, btVector3 &max)
     {
-        char uniqueID[8];
-        sprintf( uniqueID, "%07.3f", scale );
-        std::string sid = uniqueID;
-        std::string outputstring = mesh + uniqueID;
+        std::string sid = (boost::format("%07.3f") % scale).str();
+        std::string outputstring = mesh + sid;
 
         mShapeLoader->load(outputstring, "General");
         BulletShapeManager::getSingletonPtr()->load(outputstring, "General");

From 7725190f89dec2f67c3e3ad5412584d575263192 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Thu, 26 Jul 2012 19:09:45 +0200
Subject: [PATCH 20/20] removed some redundant code

---
 apps/openmw/mwworld/class.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index bb9b7d982..5267e368d 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -232,13 +232,6 @@ namespace MWWorld
     {
         Ptr newPtr = copyToCellImpl(ptr, cell);
 
-        newPtr.getRefData().setCount(ptr.getRefData().getCount());
-        if (ptr.getRefData().isEnabled()) {
-            newPtr.getRefData().enable();
-        } else {
-            newPtr.getRefData().disable();
-        }
-
         return newPtr;
     }
 
@@ -251,4 +244,3 @@ namespace MWWorld
         return newPtr;
     }
 }
-