From 67e942e733fc1410b967f7be045e2e892397e0c5 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 14 May 2014 07:13:12 +0200
Subject: [PATCH] Bug #869: Some fixes to the previous fix

---
 apps/openmw/mwclass/creature.cpp  | 4 ++++
 apps/openmw/mwclass/npc.cpp       | 2 ++
 libs/openengine/bullet/physic.cpp | 8 +++++---
 libs/openengine/bullet/physic.hpp | 1 +
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 4c6ab1c75..dc23b63f3 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -164,7 +164,11 @@ namespace MWClass
     {
         const std::string model = getModel(ptr);
         if(!model.empty())
+        {
             physics.addActor(ptr);
+            if (getCreatureStats(ptr).isDead())
+                MWBase::Environment::get().getWorld()->enableActorCollision(ptr, false);
+        }
         MWBase::Environment::get().getMechanicsManager()->add(ptr);
     }
 
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 4c9b683a4..214e51009 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -388,6 +388,8 @@ namespace MWClass
     {
         physics.addActor(ptr);
         MWBase::Environment::get().getMechanicsManager()->add(ptr);
+        if (getCreatureStats(ptr).isDead())
+            MWBase::Environment::get().getWorld()->enableActorCollision(ptr, false);
     }
 
     bool Npc::isPersistent(const MWWorld::Ptr &actor) const
diff --git a/libs/openengine/bullet/physic.cpp b/libs/openengine/bullet/physic.cpp
index c10892e52..6646ce273 100644
--- a/libs/openengine/bullet/physic.cpp
+++ b/libs/openengine/bullet/physic.cpp
@@ -18,6 +18,7 @@ namespace Physic
     PhysicActor::PhysicActor(const std::string &name, const std::string &mesh, PhysicEngine *engine, const Ogre::Vector3 &position, const Ogre::Quaternion &rotation, float scale)
       : mName(name), mEngine(engine), mMesh(mesh), mBoxScaledTranslation(0,0,0), mBoxRotationInverse(0,0,0,0)
       , mBody(0), mRaycastingBody(0), mOnGround(false), mCollisionMode(true), mBoxRotation(0,0,0,0)
+      , mCollisionBody(true)
       , mForce(0.0f)
     {
         mBody = mEngine->createAndAdjustRigidBody(mMesh, mName, scale, position, rotation, &mBoxScaledTranslation, &mBoxRotation);
@@ -49,8 +50,9 @@ namespace Physic
     void PhysicActor::enableCollisionBody(bool collision)
     {
         assert(mBody);
-        if(collision && !mCollisionMode) enableCollisionBody();
-        if(!collision && mCollisionMode) disableCollisionBody();
+        if(collision && !mCollisionBody) enableCollisionBody();
+        if(!collision && mCollisionBody) disableCollisionBody();
+        mCollisionBody = collision;
     }
 
     void PhysicActor::setPosition(const Ogre::Vector3 &pos)
@@ -108,7 +110,7 @@ namespace Physic
         //Create the newly scaled rigid body
         mBody = mEngine->createAndAdjustRigidBody(mMesh, mName, scale, pos, rot);
         mRaycastingBody = mEngine->createAndAdjustRigidBody(mMesh, mName, scale, pos, rot, 0, 0, true);
-        mEngine->addRigidBody(mBody, false, mRaycastingBody,true);  //Add rigid body to dynamics world, but do not add to object map
+        mEngine->addRigidBody(mCollisionBody ? mBody : 0, false, mRaycastingBody,true);  //Add rigid body to dynamics world, but do not add to object map
     }
 
     Ogre::Vector3 PhysicActor::getHalfExtents() const
diff --git a/libs/openengine/bullet/physic.hpp b/libs/openengine/bullet/physic.hpp
index 4e035446e..16eb45306 100644
--- a/libs/openengine/bullet/physic.hpp
+++ b/libs/openengine/bullet/physic.hpp
@@ -175,6 +175,7 @@ namespace Physic
         Ogre::Vector3 mForce;
         bool mOnGround;
         bool mCollisionMode;
+        bool mCollisionBody;
 
         std::string mMesh;
         std::string mName;