From 4b27950879b73608f69398488247786984e734e0 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 14 Sep 2014 07:04:02 +0200
Subject: [PATCH] Don't apply race height to NPC collision shape (Fixes #1487)

---
 apps/openmw/mwworld/physicssystem.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/physicssystem.cpp b/apps/openmw/mwworld/physicssystem.cpp
index 1b46f5206..51aae2bc3 100644
--- a/apps/openmw/mwworld/physicssystem.cpp
+++ b/apps/openmw/mwworld/physicssystem.cpp
@@ -719,7 +719,10 @@ namespace MWWorld
         }
 
         if (OEngine::Physic::PhysicActor* act = mEngine->getCharacter(handle))
-            act->setScale(node->getScale().x);
+        {
+            // NOTE: Ignoring Npc::adjustScale (race height) on purpose. This is a bug in MW and must be replicated for compatibility reasons
+            act->setScale(ptr.getCellRef().getScale());
+        }
     }
 
     bool PhysicsSystem::toggleCollisionMode()