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

Don't allow setting a new return position if there already is one and we haven't reached it yet

Browse source
This commit is contained in:
scrawl 2014-04-29 11:17:07 +02:00
parent 1fd7a07b5e
commit 28ef236f0e
1 changed files with 28 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw/mwmechanics/aiwander.cpp
View file

@ -341,6 +341,8 @@ namespace MWMechanics
mChooseAction = false;
mIdleNow = false;
if (!mPathFinder.isPathConstructed())
{
Ogre::Vector3 destNodePos = mReturnPosition;
ESM::Pathgrid::Point dest;
@ -363,6 +365,7 @@ namespace MWMechanics
mWalking = true;
}
}
}
if(mChooseAction)
{
@ -529,6 +532,7 @@ namespace MWMechanics
mMoveNow = false;
mWalking = false;
mChooseAction = true;
mHasReturnPosition = false;
}
return false; // AiWander package not yet completed
@ -615,7 +619,11 @@ namespace MWMechanics
void AiWander::setReturnPosition(const Ogre::Vector3& position)
{
mHasReturnPosition = true; mReturnPosition = position;
if (!mHasReturnPosition)
{
mHasReturnPosition = true;
mReturnPosition = position;
}
}
void AiWander::getRandomIdle()