1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-01 18:45:33 +00:00

Suppress travis warning and one more tweak.

This commit is contained in:
cc9cii 2014-04-20 16:49:57 +10:00
parent 2b544d550b
commit e17fab891d
2 changed files with 3 additions and 3 deletions

View file

@ -153,7 +153,7 @@ namespace MWMechanics
if(mDistance && // actor is not intended to be stationary
mIdleNow && // but is in idle
!mWalking && // FIXME: some actors are idle while walking
proximityToDoor(actor)) // NOTE: checks interior cells only
proximityToDoor(actor, MIN_DIST_TO_DOOR_SQUARED*1.6*1.6)) // NOTE: checks interior cells only
{
mIdleNow = false;
mMoveNow = true;

View file

@ -43,8 +43,8 @@ namespace MWMechanics
{
MWWorld::LiveCellRef<ESM::Door>& ref = *it;
if(pos.squaredDistance(Ogre::Vector3(ref.mRef.mPos.pos)) < minSqr)
if(closed && ref.mData.getLocalRotation().rot[2] == 0 ||
!closed && ref.mData.getLocalRotation().rot[2] >= 1)
if((closed && ref.mData.getLocalRotation().rot[2] == 0) ||
(!closed && ref.mData.getLocalRotation().rot[2] >= 1))
{
return true; // found, stop searching
}