krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Fix positionCell rotation argument when used on the player

Browse source 
This fixes the player's initial orientation on the starting boat, to properly face Jiub.
This commit is contained in:
scrawl 2014-12-01 16:43:55 +01:00
parent 46d93f1b08
commit b9d0552166
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/openmw/mwscript/transformationextensions.cpp
View file

@ -319,12 +319,11 @@ namespace MWScript
ptr = MWWorld::Ptr(ptr.getBase(), store); ptr = MWWorld::Ptr(ptr.getBase(), store);
float ax = Ogre::Radian(ptr.getRefData().getPosition().rot[0]).valueDegrees(); float ax = Ogre::Radian(ptr.getRefData().getPosition().rot[0]).valueDegrees();
float ay = Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees(); float ay = Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees();
if(ptr.getTypeName() == typeid(ESM::NPC).name())//some morrowind oddity // Note that you must specify ZRot in minutes (1 degree = 60 minutes; north = 0, east = 5400, south = 10800, west = 16200)
{ // except for when you position the player, then degrees must be used.
ax = ax/60.; // See "Morrowind Scripting for Dummies (9th Edition)" pages 50 and 54 for reference.
ay = ay/60.; if(ptr != MWBase::Environment::get().getWorld()->getPlayerPtr())
zRot = zRot/60.; zRot = zRot/60.;
}
MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,zRot); MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,zRot);
ptr.getClass().adjustPosition(ptr, false); ptr.getClass().adjustPosition(ptr, false);
@ -378,12 +377,11 @@ namespace MWScript
float ax = Ogre::Radian(ptr.getRefData().getPosition().rot[0]).valueDegrees(); float ax = Ogre::Radian(ptr.getRefData().getPosition().rot[0]).valueDegrees();
float ay = Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees(); float ay = Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees();
if(ptr.getTypeName() == typeid(ESM::NPC).name())//some morrowind oddity // Note that you must specify ZRot in minutes (1 degree = 60 minutes; north = 0, east = 5400, south = 10800, west = 16200)
{ // except for when you position the player, then degrees must be used.
ax = ax/60.; // See "Morrowind Scripting for Dummies (9th Edition)" pages 50 and 54 for reference.
ay = ay/60.; if(ptr != MWBase::Environment::get().getWorld()->getPlayerPtr())
zRot = zRot/60.; zRot = zRot/60.;
}
MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,zRot); MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,zRot);
ptr.getClass().adjustPosition(ptr, false); ptr.getClass().adjustPosition(ptr, false);
} }