mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-30 09:36:43 +00:00
Code Issues Releases Wiki Activity

Allow interrupting a walking NPC to trigger a greeting.

Browse source
This commit is contained in:
cc9cii 2014-03-24 23:20:25 +11:00
parent 2c2106205d
commit 90a813ad2c
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,6 +69,7 @@ namespace MWMechanics
return new AiWander(*this); return new AiWander(*this);
} }
// TODO: duration is passed in but never used, check if it is needed
bool AiWander::execute (const MWWorld::Ptr& actor,float duration) bool AiWander::execute (const MWWorld::Ptr& actor,float duration)
{ {
actor.getClass().getCreatureStats(actor).setDrawState(DrawState_Nothing); actor.getClass().getCreatureStats(actor).setDrawState(DrawState_Nothing);
@ -102,20 +103,21 @@ namespace MWMechanics
ESM::Position pos = actor.getRefData().getPosition(); ESM::Position pos = actor.getRefData().getPosition();
// Once off initialization to discover & store allowed node points for this actor.
if(!mStoredAvailableNodes) if(!mStoredAvailableNodes)
{ {
mStoredAvailableNodes = true;
mPathgrid = world->getStore().get<ESM::Pathgrid>().search(*actor.getCell()->getCell()); mPathgrid = world->getStore().get<ESM::Pathgrid>().search(*actor.getCell()->getCell());
mCellX = actor.getCell()->getCell()->mData.mX; mCellX = actor.getCell()->getCell()->mData.mX;
mCellY = actor.getCell()->getCell()->mData.mY; mCellY = actor.getCell()->getCell()->mData.mY;
// TODO: If there is no path does this actor get stuck forever?
if(!mPathgrid) if(!mPathgrid)
mDistance = 0; mDistance = 0;
else if(mPathgrid->mPoints.empty()) else if(mPathgrid->mPoints.empty())
mDistance = 0; mDistance = 0;
if(mDistance) if(mDistance) // A distance value is initially passed into the constructor.
{ {
mXCell = 0; mXCell = 0;
mYCell = 0; mYCell = 0;
@ -151,10 +153,13 @@ namespace MWMechanics
} }
mCurrentNode = mAllowedNodes[index]; mCurrentNode = mAllowedNodes[index];
mAllowedNodes.erase(mAllowedNodes.begin() + index); mAllowedNodes.erase(mAllowedNodes.begin() + index);
mStoredAvailableNodes = true; // set only if successful in finding allowed nodes
} }
} }
} }
// TODO: Does this actor stay in one spot forever while in AiWander?
if(mAllowedNodes.empty()) if(mAllowedNodes.empty())
mDistance = 0; mDistance = 0;
@ -162,7 +167,7 @@ namespace MWMechanics
if(mDistance && (mCellX != actor.getCell()->getCell()->mData.mX || mCellY != actor.getCell()->getCell()->mData.mY)) if(mDistance && (mCellX != actor.getCell()->getCell()->mData.mX || mCellY != actor.getCell()->getCell()->mData.mY))
mDistance = 0; mDistance = 0;
if(mChooseAction) if(mChooseAction) // Initially set true by the constructor.
{ {
mPlayedIdle = 0; mPlayedIdle = 0;
unsigned short idleRoll = 0; unsigned short idleRoll = 0;
@ -208,7 +213,8 @@ namespace MWMechanics
} }
} }
if(mIdleNow) // Allow interrupting a walking actor to trigger a greeting
if(mIdleNow || (mWalking && (mWalkState != State_Norm)))
{ {
// Play a random voice greeting if the player gets too close // Play a random voice greeting if the player gets too close
const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore(); const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
@ -222,6 +228,14 @@ namespace MWMechanics
float playerDist = Ogre::Vector3(player.getRefData().getPosition().pos).distance( float playerDist = Ogre::Vector3(player.getRefData().getPosition().pos).distance(
Ogre::Vector3(actor.getRefData().getPosition().pos)); Ogre::Vector3(actor.getRefData().getPosition().pos));
if(mWalking && playerDist <= helloDistance)
{
stopWalking(actor);
mMoveNow = false;
mWalking = false;
mWalkState = State_Norm;
}
if (!mSaidGreeting) if (!mSaidGreeting)
{ {
// TODO: check if actor is aware / has line of sight // TODO: check if actor is aware / has line of sight
@ -353,7 +367,7 @@ namespace MWMechanics
if(mWalkState == State_Evade) if(mWalkState == State_Evade)
{ {
//std::cout << "Stuck \""<<actor.getClass().getName(actor)<<"\"" << std::endl; //std::cout << "Stuck \""<<actor.getClass().getName(actor)<<"\"" << std::endl;
// diagonal should have same animation as walk forward // diagonal should have same animation as walk forward
actor.getClass().getMovementSettings(actor).mPosition[0] = 1; actor.getClass().getMovementSettings(actor).mPosition[0] = 1;
@ -369,7 +383,7 @@ namespace MWMechanics
if(mStuckCount >= COUNT_BEFORE_RESET) // something has gone wrong, reset if(mStuckCount >= COUNT_BEFORE_RESET) // something has gone wrong, reset
{ {
//std::cout << "Reset \""<<actor.getClass().getName(actor)<<"\"" << std::endl; //std::cout << "Reset \""<<actor.getClass().getName(actor)<<"\"" << std::endl;
mWalkState = State_Norm; mWalkState = State_Norm;
mStuckCount = 0; mStuckCount = 0;