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

Fix PQ issues while calculating paths

Browse Source
This commit is contained in:
Dmitry Orlov
2020-09-22 00:19:40 +03:00
parent 08ce838e04
commit 5e0023704b
5 changed files with 110 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,7 +119,7 @@ CGPathNode * AINodeStorage::getInitialNode()
initialNode->turns = 0;
initialNode->moveRemains = hero->movement;
initialNode->danger = 0;
initialNode->cost = 0.0;
initialNode->setCost(0.0);
return initialNode;
}
@@ -146,7 +146,7 @@ void AINodeStorage::commit(CDestinationNodeInfo & destination, const PathNodeInf
{
dstNode->moveRemains = destination.movementLeft;
dstNode->turns = destination.turn;
dstNode->cost = destination.cost;
dstNode->setCost(destination.cost);
dstNode->danger = srcNode->danger;
dstNode->action = destination.action;
dstNode->theNodeBefore = srcNode->theNodeBefore;
@@ -305,7 +305,7 @@ bool AINodeStorage::hasBetterChain(const PathNodeInfo & source, CDestinationNode
if(node.danger <= destinationNode->danger && destinationNode->chainMask == 1 && node.chainMask == 0)
{
if(node.cost < destinationNode->cost)
if(node.getCost() < destinationNode->getCost())
{
#ifdef VCMI_TRACE_PATHFINDER
logAi->trace(
@@ -349,7 +349,7 @@ std::vector<AIPath> AINodeStorage::getChainInfo(const int3 & pos, bool isOnLand)
while(current != nullptr && current->coord != initialPos)
{
AIPathNodeInfo pathNode;
pathNode.cost = current->cost;
pathNode.cost = current->getCost();
pathNode.turns = current->turns;
pathNode.danger = current->danger;
pathNode.coord = current->coord;