forked from mirror/openmw-tes3mp
Merge branch 'master' into next
This commit is contained in:
commit
f45a6b71a9
2 changed files with 3 additions and 3 deletions
|
@ -442,7 +442,7 @@ namespace MWScript
|
|||
|
||||
ESM::Position ipos = MWBase::Environment::get().getWorld()->getPlayer().getPlayer().getRefData().getPosition();
|
||||
Ogre::Vector3 pos(ipos.pos[0],ipos.pos[1],ipos.pos[2]);
|
||||
Ogre::Quaternion rot(Ogre::Radian(ipos.rot[2]), Ogre::Vector3::UNIT_Z);
|
||||
Ogre::Quaternion rot(Ogre::Radian(-ipos.rot[2]), Ogre::Vector3::UNIT_Z);
|
||||
if(direction == 0) pos = pos + distance*rot.yAxis();
|
||||
else if(direction == 1) pos = pos - distance*rot.yAxis();
|
||||
else if(direction == 2) pos = pos - distance*rot.xAxis();
|
||||
|
@ -485,7 +485,7 @@ namespace MWScript
|
|||
|
||||
ESM::Position ipos = me.getRefData().getPosition();
|
||||
Ogre::Vector3 pos(ipos.pos[0],ipos.pos[1],ipos.pos[2]);
|
||||
Ogre::Quaternion rot(Ogre::Radian(ipos.rot[2]), Ogre::Vector3::UNIT_Z);
|
||||
Ogre::Quaternion rot(Ogre::Radian(-ipos.rot[2]), Ogre::Vector3::UNIT_Z);
|
||||
if(direction == 0) pos = pos + distance*rot.yAxis();
|
||||
else if(direction == 1) pos = pos - distance*rot.yAxis();
|
||||
else if(direction == 2) pos = pos - distance*rot.xAxis();
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
data="?global?"data"
|
||||
data="?global?data"
|
||||
data="?mw?Data Files"
|
||||
data-local="?local?data"
|
||||
resources=${MORROWIND_RESOURCE_FILES}
|
||||
|
|
Loading…
Reference in a new issue