From ebc1fdd017dfadcc45326bca8e6e4ee0ec330485 Mon Sep 17 00:00:00 2001 From: Torben Carrington Date: Mon, 27 May 2013 09:05:42 -0700 Subject: [PATCH] AIWander Patch - fixed another possibility of a bug occuring, best to fix it now then wait until it happens. --- apps/openmw/mwmechanics/aiwander.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp index 4f7b690160..0a7815ca43 100644 --- a/apps/openmw/mwmechanics/aiwander.cpp +++ b/apps/openmw/mwmechanics/aiwander.cpp @@ -92,7 +92,10 @@ bool MWMechanics::AiWander::execute (const MWWorld::Ptr& actor) mCellX = actor.getCell()->mCell->mData.mX; mCellY = actor.getCell()->mCell->mData.mY; - if(mDistance && !mPathgrid->mPoints.empty()) + if(mPathgrid->mPoints.empty()) + mDistance = 0; + + if(mDistance) { mXCell = 0; mYCell = 0; @@ -126,10 +129,9 @@ bool MWMechanics::AiWander::execute (const MWWorld::Ptr& actor) } mCurrentNode = mAllowedNodes[index]; mAllowedNodes.erase(mAllowedNodes.begin() + index); - if(mAllowedNodes.empty()) - mDistance = 0; } - else + + if(mAllowedNodes.empty()) mDistance = 0; } }