games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-27 21:49:10 +02:00
Code Issues Releases Activity

Sonarcloud issues

Browse Source
This commit is contained in:
Tomasz Zieliński 2024-05-10 17:07:09 +02:00
parent 21bb61fc4d
commit ee27a79aa1
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/rmg/modificators/RoadPlacer.cpp
View File

@ -64,7 +64,7 @@ const rmg::Area & RoadPlacer::getRoads() const
return roads; return roads;
} }
bool RoadPlacer::createRoad(const int3 & dst) bool RoadPlacer::createRoad(const int3 & destination)
{ {
auto searchArea = zone.areaPossible() + zone.freePaths() + areaRoads + roads; auto searchArea = zone.areaPossible() + zone.freePaths() + areaRoads + roads;
@ -84,8 +84,6 @@ bool RoadPlacer::createRoad(const int3 & dst)
else else
{ {
float ret = dst.dist2d(src); float ret = dst.dist2d(src);
// TODO: Prefer zig-zag connections
if (visitableTiles.contains(src) || visitableTiles.contains(dst)) if (visitableTiles.contains(src) || visitableTiles.contains(dst))
{ {
@ -100,7 +98,7 @@ bool RoadPlacer::createRoad(const int3 & dst)
} }
}; };
auto res = path.search(dst, true, simpleRoutig); auto res = path.search(destination, true, simpleRoutig);
if(!res.valid()) if(!res.valid())
{ {
auto desperateRoutig = [this, &VISITABLE_PENALTY](const int3& src, const int3& dst) -> float auto desperateRoutig = [this, &VISITABLE_PENALTY](const int3& src, const int3& dst) -> float
@ -130,11 +128,11 @@ bool RoadPlacer::createRoad(const int3 & dst)
} }
return ret; return ret;
}; };
res = path.search(dst, false, desperateRoutig); res = path.search(destination, false, desperateRoutig);
if(!res.valid()) if(!res.valid())
{ {
logGlobal->warn("Failed to create road to node %s", dst.toString()); logGlobal->warn("Failed to create road to node %s", destination.toString());
return false; return false;
} }
} }