games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-23 00:28:08 +02:00
Code Issues Releases Activity

CPathfinder: get rid of addNeighbours coord argument

Browse Source
This commit is contained in:
ArseniyShestakov
2015-11-16 19:36:15 +03:00
parent 8f72d73241
commit d524b4eabe
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/CPathfinder.cpp
View File

@ -107,7 +107,7 @@ void CPathfinder::calculatePaths()
} }
//add accessible neighbouring nodes to the queue //add accessible neighbouring nodes to the queue
addNeighbours(cp->coord); addNeighbours();
for(auto & neighbour : neighbours) for(auto & neighbour : neighbours)
{ {
dt = &gs->map->getTile(neighbour); dt = &gs->map->getTile(neighbour);
@ -186,11 +186,11 @@ void CPathfinder::calculatePaths()
} //queue loop } //queue loop
} }
void CPathfinder::addNeighbours(const int3 & coord) void CPathfinder::addNeighbours()
{ {
neighbours.clear(); neighbours.clear();
std::vector<int3> tiles; std::vector<int3> tiles;
CPathfinderHelper::getNeighbours(gs, *ct, coord, tiles, boost::logic::indeterminate, cp->layer == ELayer::SAIL); // TODO: find out if we still need "limitCoastSailing" option CPathfinderHelper::getNeighbours(gs, *ct, cp->coord, tiles, boost::logic::indeterminate, cp->layer == ELayer::SAIL); // TODO: find out if we still need "limitCoastSailing" option
if(isSourceVisitableObj()) if(isSourceVisitableObj())
{ {
for(int3 tile: tiles) for(int3 tile: tiles)

2
lib/CPathfinder.h
View File

@ -165,7 +165,7 @@ private:
const CGObjectInstance * ctObj, * dtObj; const CGObjectInstance * ctObj, * dtObj;
CGPathNode::ENodeAction destAction; CGPathNode::ENodeAction destAction;
void addNeighbours(const int3 & coord); void addNeighbours();
void addTeleportExits(); void addTeleportExits();
bool isLayerTransitionPossible() const; bool isLayerTransitionPossible() const;