From 876fb9a899cf19a045b0b9a63be6144f1f1c0daa Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 19 Dec 2013 00:11:14 +0100
Subject: [PATCH] Addition to bb4bd999ba706e : adjust position for objects
 placed from inventory

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

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index f64d22122..448211bc2 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1095,7 +1095,7 @@ namespace MWWorld
 
     MWWorld::Ptr World::safePlaceObject(const MWWorld::Ptr& ptr,MWWorld::CellStore &Cell,ESM::Position pos)
     {
-        return copyObjectToCell(ptr,Cell,pos);
+        return copyObjectToCell(ptr,Cell,pos,false);
     }
 
     void World::indexToPosition (int cellX, int cellY, float &x, float &y, bool centre) const
@@ -1516,7 +1516,7 @@ namespace MWWorld
         // copy the object and set its count
         int origCount = object.getRefData().getCount();
         object.getRefData().setCount(amount);
-        Ptr dropped = copyObjectToCell(object, *cell, pos);
+        Ptr dropped = copyObjectToCell(object, *cell, pos, true);
         object.getRefData().setCount(origCount);
 
         // only the player place items in the world, so no need to check actor
@@ -1537,13 +1537,13 @@ namespace MWWorld
     }
 
 
-    Ptr World::copyObjectToCell(const Ptr &object, CellStore &cell, const ESM::Position &pos)
+    Ptr World::copyObjectToCell(const Ptr &object, CellStore &cell, const ESM::Position &pos, bool adjustPos)
     {
         /// \todo add searching correct cell for position specified
         MWWorld::Ptr dropped =
             MWWorld::Class::get(object).copyToCell(object, cell, pos);
 
-        if (object.getClass().isActor())
+        if (object.getClass().isActor() || adjustPos)
         {
             Ogre::Vector3 min, max;
             if (mPhysics->getObjectAABB(object, min, max)) {
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index c8133441d..5a51cb773 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -114,8 +114,7 @@ namespace MWWorld
             bool moveObjectImp (const Ptr& ptr, float x, float y, float z);
             ///< @return true if the active cell (cell player is in) changed
 
-
-            Ptr copyObjectToCell(const Ptr &ptr, CellStore &cell, const ESM::Position &pos);
+            Ptr copyObjectToCell(const Ptr &ptr, CellStore &cell, const ESM::Position &pos, bool adjustPos=true);
 
             void updateWindowManager ();
             void performUpdateSceneQueries ();