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

Improved road routing so they can go under any passable object.

Browse Source
This commit is contained in:
DjWarmonger 2016-12-21 10:10:37 +01:00
parent f78b524731
commit cc452bdfa9
5 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CCallback.cpp
View File

@ -275,8 +275,8 @@ CCallback::~CCallback()
bool CCallback::canMoveBetween(const int3 &a, const int3 &b)
{
//TODO: merge with Pathfinder::canMoveBetween
return gs->checkForVisitableDir(a, b) && gs->checkForVisitableDir(b, a);
//bidirectional
return gs->map->canMoveBetween(a, b);
}
const CPathsInfo * CCallback::getPathsInfo(const CGHeroInstance *h)

6
lib/mapping/CMap.cpp
View File

@ -385,6 +385,12 @@ bool CMap::isWaterTile(const int3 &pos) const
{
return isInTheMap(pos) && getTile(pos).isWater();
}
bool CMap::canMoveBetween(const int3 &src, const int3 &dst) const
{
const TerrainTile * dstTile = &getTile(dst);
const TerrainTile * srcTile = &getTile(src);
return checkForVisitableDir(src, dstTile, dst) && checkForVisitableDir(dst, srcTile, src);
}
bool CMap::checkForVisitableDir(const int3 & src, const TerrainTile *pom, const int3 & dst ) const
{

1
lib/mapping/CMap.h
View File

@ -304,6 +304,7 @@ public:
bool isInTheMap(const int3 & pos) const;
bool isWaterTile(const int3 & pos) const;
bool canMoveBetween(const int3 &src, const int3 &dst) const;
bool checkForVisitableDir( const int3 & src, const TerrainTile *pom, const int3 & dst ) const;
int3 guardingCreaturePosition (int3 pos) const;

2
lib/rmg/CMapGenerator.cpp
View File

@ -319,7 +319,7 @@ void CMapGenerator::fillZones()
it.second->createObstacles2(this);
}
#define PRINT_MAP_BEFORE_ROADS true
#define PRINT_MAP_BEFORE_ROADS false
if (PRINT_MAP_BEFORE_ROADS) //enable to debug
{
std::ofstream out("road debug");

15
lib/rmg/CRmgTemplateZone.cpp
View File

@ -776,6 +776,7 @@ bool CRmgTemplateZone::createRoad(CMapGenerator* gen, const int3& src, const int
pq.pop(); //remove top element
int3 currentNode = node.first;
closed.insert (currentNode);
auto currentTile = &gen->map->getTile(currentNode);
if (currentNode == dst || gen->isRoad(currentNode))
{
@ -798,7 +799,7 @@ bool CRmgTemplateZone::createRoad(CMapGenerator* gen, const int3& src, const int
bool directNeighbourFound = false;
float movementCost = 1;
auto foo = [gen, this, &pq, &distances, &closed, &cameFrom, &currentNode, &node, &dst, &directNeighbourFound, &movementCost](int3& pos) -> void
auto foo = [gen, this, &pq, &distances, &closed, &cameFrom, &currentNode, &currentTile, &node, &dst, &directNeighbourFound, &movementCost](int3& pos) -> void
{
if (vstd::contains(closed, pos)) //we already visited that node
return;
@ -810,10 +811,13 @@ bool CRmgTemplateZone::createRoad(CMapGenerator* gen, const int3& src, const int
if (distance < bestDistanceSoFar)
{
auto obj = gen->map->getTile(pos).topVisitableObj();
//FIXME: make road go through any empty or visitable tile
//if (gen->map->checkForVisitableDir(currentNode, &gen->map->getTile(pos), pos)) //TODO: why it has no effect?
if (gen->isFree(pos) || (obj && obj->ID == Obj::MONSTER) || pos == dst)
auto tile = &gen->map->getTile(pos);
auto obj = tile->topVisitableObj();
bool canMoveBetween = gen->map->canMoveBetween(currentNode, pos);
if (gen->isFree(pos) && gen->isFree(currentNode) //empty path
|| ((tile->visitable || currentTile->visitable) && canMoveBetween) //moving from or to visitable object
|| pos == dst) //we already compledted the path
{
if (gen->getZoneID(pos) == id || pos == dst) //otherwise guard position may appear already connected to other zone.
{
@ -821,7 +825,6 @@ bool CRmgTemplateZone::createRoad(CMapGenerator* gen, const int3& src, const int
distances[pos] = distance;
pq.push(std::make_pair(pos, distance));
directNeighbourFound = true;
//logGlobal->traceStream() << boost::format("Found connection between node %s and %s, current distance %d") % currentNode % pos % distance;
}
}
}