games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-26 03:52:01 +02:00
Code Issues Releases Activity

Something works it seems

Browse Source
This commit is contained in:
DjWarmonger 2015-05-25 17:47:32 +02:00
parent bfd4ff8954
commit 2c88ddf5ed
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/rmg/CRmgTemplateZone.cpp
View File

@ -732,7 +732,7 @@ bool CRmgTemplateZone::createRoad(CMapGenerator* gen, const int3& src, const int
{ {
int3 currentNode = *boost::min_element(open, [&distances](const int3 &pos1, const int3 &pos2) -> bool int3 currentNode = *boost::min_element(open, [&distances](const int3 &pos1, const int3 &pos2) -> bool
{ {
return distances[pos1], distances[pos2]; return distances[pos1] < distances[pos2];
}); });
vstd::erase_if_present(open, currentNode); vstd::erase_if_present(open, currentNode);
@ -756,7 +756,7 @@ bool CRmgTemplateZone::createRoad(CMapGenerator* gen, const int3& src, const int
} }
else else
{ {
gen->foreach_neighbour(currentNode, [gen, this, &open, &closed, &cameFrom, &currentNode, &distances](int3& pos) gen->foreach_neighbour(currentNode, [gen, this, &open, &closed, &cameFrom, &currentNode, &distances, &dst](int3& pos)
{ {
int distance = distances[currentNode] + 1; int distance = distances[currentNode] + 1;
int bestDistanceSoFar = 1e6; //FIXME: boost::limits int bestDistanceSoFar = 1e6; //FIXME: boost::limits
@ -766,8 +766,9 @@ bool CRmgTemplateZone::createRoad(CMapGenerator* gen, const int3& src, const int
if (distance < bestDistanceSoFar || !vstd::contains(closed, pos)) if (distance < bestDistanceSoFar || !vstd::contains(closed, pos))
{ {
if (gen->map->checkForVisitableDir(currentNode, &gen->map->getTile(pos), pos)) auto obj = gen->map->getTile(pos).topVisitableObj();
//if (gen->isFree(pos)) //if (gen->map->checkForVisitableDir(currentNode, &gen->map->getTile(pos), pos)) //TODO: why it has no effect?
if (gen->isFree(pos) || pos == dst || (obj && obj->ID == Obj::MONSTER))
{ {
if (vstd::contains(this->tileinfo, pos)) if (vstd::contains(this->tileinfo, pos))
{ {