From 53fb17da10436022178562d5d573659f769e0102 Mon Sep 17 00:00:00 2001
From: Glorf <michal1.bien@gmail.com>
Date: Wed, 24 Apr 2013 21:42:04 +0200
Subject: [PATCH] Rotation system fixes

---
 apps/openmw/mwscript/transformationextensions.cpp | 9 +++------
 apps/openmw/mwworld/worldimp.cpp                  | 8 ++++++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index beb6c3d8c1..f2179897dc 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -153,15 +153,15 @@ namespace MWScript
 
                     if (axis=="x")
                     {
-                        runtime.push(Ogre::Radian(ptr.getRefData().getPosition().rot[0]).valueDegrees()+ptr.getRefData().getLocalRotation().rot[0]);
+                        runtime.push(Ogre::Radian(ptr.getCellRef().mPos.rot[0]).valueDegrees()+ptr.getRefData().getLocalRotation().rot[0]);
                     }
                     else if (axis=="y")
                     {
-                        runtime.push(Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees()+ptr.getRefData().getLocalRotation().rot[1]);
+                        runtime.push(Ogre::Radian(ptr.getCellRef().mPos.rot[1]).valueDegrees()+ptr.getRefData().getLocalRotation().rot[1]);
                     }
                     else if (axis=="z")
                     {
-                        runtime.push(Ogre::Radian(ptr.getRefData().getPosition().rot[2]).valueDegrees()+ptr.getRefData().getLocalRotation().rot[2]);
+                        runtime.push(Ogre::Radian(ptr.getCellRef().mPos.rot[2]).valueDegrees()+ptr.getRefData().getLocalRotation().rot[2]);
                     }
                     else
                         throw std::runtime_error ("invalid ration axis: " + axis);
@@ -563,17 +563,14 @@ namespace MWScript
 
                     if (axis == "x")
                     {
-                        ptr.getRefData().getLocalRotation().rot[0]+=rotation;
                         MWBase::Environment::get().getWorld()->localRotateObject(ptr, rotation, Ogre::Vector3::UNIT_X);
                     }
                     else if (axis == "y")
                     {
-                        ptr.getRefData().getLocalRotation().rot[1]+=rotation;
                         MWBase::Environment::get().getWorld()->localRotateObject(ptr, rotation, Ogre::Vector3::UNIT_Y);
                     }
                     else if (axis == "z")
                     {
-                        ptr.getRefData().getLocalRotation().rot[2]+=rotation;
                         MWBase::Environment::get().getWorld()->localRotateObject(ptr, rotation, Ogre::Vector3::UNIT_Z);
                     }
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 69bcad619d..aa9107c6ec 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -827,6 +827,14 @@ namespace MWWorld
     void World::localRotateObject (const Ptr& ptr, float rotation, Ogre::Vector3 axis)
     {
         if (ptr.getRefData().getBaseNode() != 0) {
+
+            if(axis==Ogre::Vector3::UNIT_X)
+                ptr.getRefData().getLocalRotation().rot[0]+=rotation;
+            else if(axis==Ogre::Vector3::UNIT_Y)
+                ptr.getRefData().getLocalRotation().rot[1]+=rotation;
+            else if(axis==Ogre::Vector3::UNIT_Z)
+                ptr.getRefData().getLocalRotation().rot[2]+=rotation;
+
             ptr.getRefData().getBaseNode()->rotate(Ogre::Quaternion(Ogre::Radian(Ogre::Degree(-rotation).valueRadians()), axis));
             mPhysics->rotateObject(ptr);
         }