mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-13 07:14:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'rotz' into 'master'

Browse Source 
Ignore the axis argument when rotating the player

Closes #6324

See merge request OpenMW/openmw!1409
This commit is contained in:
Alexei Kotov 2021-11-20 00:02:48 +00:00
commit 8fd9cb1efc
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -68,6 +68,7 @@
Bug #6321: Arrow enchantments should always be applied to the target 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 #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 #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 #6326: Detect Enchantment/Key should detect items in unresolved containers
Bug #6327: Blocking roots the character in place Bug #6327: Blocking roots the character in place
Bug #6343: Magic projectile speed doesn't take race weight into account Bug #6343: Magic projectile speed doesn't take race weight into account

7
apps/openmw/mwscript/transformationextensions.cpp
View File

@ -622,12 +622,13 @@ namespace MWScript
runtime.pop(); runtime.pop();
auto rot = ptr.getRefData().getPosition().asRotationVec3(); 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; rot.x() += rotation;
else if (axis == "y") else if (axis == "y")
rot.y() += rotation; rot.y() += rotation;
else if (axis == "z")
rot.z() += rotation;
MWBase::Environment::get().getWorld()->rotateObject(ptr,rot); MWBase::Environment::get().getWorld()->rotateObject(ptr,rot);
} }
}; };