mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-29 09:45:32 +00:00
Code Issues Releases Wiki Activity

AiWander: reset mAllowedNodes on cell change (Fixes #3176, Fixes #3130)

Browse source
This commit is contained in:
scrawl 2016-02-02 00:39:37 +01:00
parent dda4273349
commit 50ed061154
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -730,6 +730,8 @@ namespace MWMechanics
const ESM::Pathgrid * const ESM::Pathgrid *
pathgrid = MWBase::Environment::get().getWorld()->getStore().get<ESM::Pathgrid>().search(*cell); pathgrid = MWBase::Environment::get().getWorld()->getStore().get<ESM::Pathgrid>().search(*cell);
mAllowedNodes.clear();
// If there is no path this actor doesn't go anywhere. See: // If there is no path this actor doesn't go anywhere. See:
// https://forum.openmw.org/viewtopic.php?t=1556 // https://forum.openmw.org/viewtopic.php?t=1556
// http://www.fliggerty.com/phpBB3/viewtopic.php?f=30&t=5833 // http://www.fliggerty.com/phpBB3/viewtopic.php?f=30&t=5833

4
apps/openmw/mwmechanics/aiwander.hpp
View file

@ -120,16 +120,20 @@ namespace MWMechanics
MWWorld::TimeStamp mStartTime; MWWorld::TimeStamp mStartTime;
// allowed pathgrid nodes based on mDistance from the spawn point // allowed pathgrid nodes based on mDistance from the spawn point
// in local coordinates of mCell
// FIXME: move to AiWanderStorage
std::vector<ESM::Pathgrid::Point> mAllowedNodes; std::vector<ESM::Pathgrid::Point> mAllowedNodes;
void getAllowedNodes(const MWWorld::Ptr& actor, const ESM::Cell* cell); void getAllowedNodes(const MWWorld::Ptr& actor, const ESM::Cell* cell);
// FIXME: move to AiWanderStorage
ESM::Pathgrid::Point mCurrentNode; ESM::Pathgrid::Point mCurrentNode;
bool mTrimCurrentNode; bool mTrimCurrentNode;
void trimAllowedNodes(std::vector<ESM::Pathgrid::Point>& nodes, void trimAllowedNodes(std::vector<ESM::Pathgrid::Point>& nodes,
const PathFinder& pathfinder); const PathFinder& pathfinder);
// FIXME: move to AiWanderStorage
// ObstacleCheck mObstacleCheck; // ObstacleCheck mObstacleCheck;
float mDoorCheckDuration; float mDoorCheckDuration;
int mStuckCount; int mStuckCount;