Suppress travis warning and one more tweak.

actorid
cc9cii 11 years ago
parent 2b544d550b
commit e17fab891d

@ -153,7 +153,7 @@ namespace MWMechanics
if(mDistance && // actor is not intended to be stationary if(mDistance && // actor is not intended to be stationary
mIdleNow && // but is in idle mIdleNow && // but is in idle
!mWalking && // FIXME: some actors are idle while walking !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; mIdleNow = false;
mMoveNow = true; mMoveNow = true;

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

Loading…
Cancel
Save