1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 21:53:51 +00:00

Merge remote-tracking branch 'mrcheko/master'

This commit is contained in:
Marc Zinnschlag 2014-05-01 10:07:43 +02:00
commit 6a809064df
3 changed files with 4 additions and 4 deletions

View file

@ -539,14 +539,14 @@ namespace MWMechanics
}
void AiWander::trimAllowedNodes(std::vector<ESM::Pathgrid::Point>& nodes,
PathFinder& pathfinder)
const PathFinder& pathfinder)
{
// TODO: how to add these back in once the door opens?
// Idea: keep a list of detected closed doors (see aicombat.cpp)
// Every now and then check whether one of the doors is opened. (maybe
// at the end of playing idle?) If the door is opened then re-calculate
// allowed nodes starting from the spawn point.
std::list<ESM::Pathgrid::Point>& paths = pathfinder.getPath();
std::list<ESM::Pathgrid::Point> paths = pathfinder.getPath();
while(paths.size() >= 2)
{
ESM::Pathgrid::Point pt = paths.back();

View file

@ -77,7 +77,7 @@ namespace MWMechanics
ESM::Pathgrid::Point mCurrentNode;
bool mTrimCurrentNode;
void trimAllowedNodes(std::vector<ESM::Pathgrid::Point>& nodes,
PathFinder& pathfinder);
const PathFinder& pathfinder);
PathFinder mPathFinder;

View file

@ -57,7 +57,7 @@ namespace MWMechanics
return mPath.size();
}
std::list<ESM::Pathgrid::Point>& getPath()
const std::list<ESM::Pathgrid::Point>& getPath() const
{
return mPath;
}