Merge branch 'rotz' into 'master'

Ignore the axis argument when rotating the player

Closes #6324

See merge request OpenMW/openmw!1409

CHANGELOG.md

@@ -68,6 +68,7 @@
     Bug #6321: Arrow enchantments should always be applied to the target
     Bug #6322: Total sold/cost should reset to 0 when there are no items offered
     Bug #6323: Wyrmhaven: Alboin doesn't follower the player character out of his house
+    Bug #6324: Special Slave Companions: Can't buy the slave companions
     Bug #6326: Detect Enchantment/Key should detect items in unresolved containers
     Bug #6327: Blocking roots the character in place
     Bug #6343: Magic projectile speed doesn't take race weight into account

apps/openmw/mwscript/transformationextensions.cpp

@@ -622,12 +622,13 @@ namespace MWScript
                     runtime.pop();
 
                     auto rot = ptr.getRefData().getPosition().asRotationVec3();
-                    if (axis == "x")
+                    // Regardless of the axis argument, the player may only be rotated on Z
+                    if (axis == "z" || MWMechanics::getPlayer() == ptr)
+                        rot.z() += rotation;
+                    else if (axis == "x")
                         rot.x() += rotation;
                     else if (axis == "y")
                         rot.y() += rotation;
-                    else if (axis == "z")
-                        rot.z() += rotation;
                     MWBase::Environment::get().getWorld()->rotateObject(ptr,rot);
                 }
         };