games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity

AI pathfinding: fix getPathsToTile for water tiles

Browse Source
This commit is contained in:
Andrii Danylchenko 2018-10-28 15:03:40 +02:00
parent bd0f8f840a
commit d5b26d9592
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AI/VCAI/Pathfinding/AINodeStorage.cpp
View File

@ -181,10 +181,10 @@ bool AINodeStorage::hasBetterChain(const PathNodeInfo & source, CDestinationNode
return false; return false;
} }
std::vector<AIPath> AINodeStorage::getChainInfo(int3 pos) const std::vector<AIPath> AINodeStorage::getChainInfo(int3 pos, bool isOnLand) const
{ {
std::vector<AIPath> paths; std::vector<AIPath> paths;
auto chains = nodes[pos.x][pos.y][pos.z][EPathfindingLayer::LAND]; auto chains = nodes[pos.x][pos.y][pos.z][isOnLand ? EPathfindingLayer::LAND : EPathfindingLayer::SAIL];
for(const AIPathNode & node : chains) for(const AIPathNode & node : chains)
{ {

2
AI/VCAI/Pathfinding/AINodeStorage.h
View File

@ -98,7 +98,7 @@ public:
bool isBattleNode(const CGPathNode * node) const; bool isBattleNode(const CGPathNode * node) const;
bool hasBetterChain(const PathNodeInfo & source, CDestinationNodeInfo & destination) const; bool hasBetterChain(const PathNodeInfo & source, CDestinationNodeInfo & destination) const;
boost::optional<AIPathNode *> getOrCreateNode(const int3 & coord, const EPathfindingLayer layer, int chainNumber); boost::optional<AIPathNode *> getOrCreateNode(const int3 & coord, const EPathfindingLayer layer, int chainNumber);
std::vector<AIPath> getChainInfo(int3 pos) const; std::vector<AIPath> getChainInfo(int3 pos, bool isOnLand) const;
void setHero(HeroPtr heroPtr) void setHero(HeroPtr heroPtr)
{ {

10
AI/VCAI/Pathfinding/AIPathfinder.cpp
View File

@ -11,6 +11,7 @@
#include "AIPathfinder.h" #include "AIPathfinder.h"
#include "AIPathfinderConfig.h" #include "AIPathfinderConfig.h"
#include "../../../CCallback.h" #include "../../../CCallback.h"
#include "../../../lib/mapping/CMap.h"
std::vector<std::shared_ptr<AINodeStorage>> AIPathfinder::storagePool; std::vector<std::shared_ptr<AINodeStorage>> AIPathfinder::storagePool;
std::map<HeroPtr, std::shared_ptr<AINodeStorage>> AIPathfinder::storageMap; std::map<HeroPtr, std::shared_ptr<AINodeStorage>> AIPathfinder::storageMap;
@ -58,5 +59,12 @@ std::vector<AIPath> AIPathfinder::getPathInfo(HeroPtr hero, int3 tile)
nodeStorage = storageMap.at(hero); nodeStorage = storageMap.at(hero);
} }
return nodeStorage->getChainInfo(tile); const TerrainTile * tileInfo = cb->getTile(tile, false);
if(!tileInfo)
{
return std::vector<AIPath>();
}
return nodeStorage->getChainInfo(tile, !tileInfo->isWater());
} }