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

Updated C::B projects, fixed a few warnings

Browse Source
This commit is contained in:
AlexVinS
2018-10-10 16:07:28 +03:00
parent cbaa834589
commit be45c8cb43
7 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,7 @@ void AINodeStorage::updateAINode(CGPathNode * node, std::function<void(AIPathNod
bool AINodeStorage::isBattleNode(const CGPathNode * node) const
{
return getAINode(node)->chainMask & BATTLE_CHAIN > 0;
return (getAINode(node)->chainMask & BATTLE_CHAIN) > 0;
}
AIPathNode * AINodeStorage::getNode(const int3 & coord, const EPathfindingLayer layer, int chainNumber)
@@ -75,7 +75,7 @@ void AINodeStorage::commit(CDestinationNodeInfo & destination, const PathNodeInf
dstNode->turns = destination.turn;
dstNode->danger = srcNode->danger;
dstNode->action = destination.action;
dstNode->theNodeBefore = srcNode->theNodeBefore;
dstNode->theNodeBefore = srcNode->theNodeBefore;
});
}
@@ -140,12 +140,12 @@ bool AINodeStorage::hasBetterChain(const PathNodeInfo & source, CDestinationNode
if(node.danger <= destinationNode->danger && destinationNode->chainMask == 1 && node.chainMask == 0)
{
if(node.turns < destinationNode->turns
|| node.turns == destinationNode->turns && node.moveRemains >= destinationNode->moveRemains)
|| (node.turns == destinationNode->turns && node.moveRemains >= destinationNode->moveRemains))
{
logAi->trace(
"Block ineficient move %s:->%s, mask=%i, mp diff: %i",
source.coord.toString(),
destination.coord.toString(),
destination.coord.toString(),
destinationNode->chainMask,
node.moveRemains - destinationNode->moveRemains);
@@ -234,4 +234,4 @@ uint64_t AIPath::getTotalDanger(HeroPtr hero) const
uint64_t danger = pathDanger > objDanger ? pathDanger : objDanger;
return danger;
}
}

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

@@ -12,7 +12,7 @@
#include "../../../lib/CPathfinder.h"
#include "../../../lib/mapObjects/CGHeroInstance.h"
#include "AIUtility.h"
#include "../AIUtility.h"
class IVirtualObject
{

4
AI/VCAI/Pathfinding/AIPathfinder.h
View File

@@ -10,7 +10,7 @@
#pragma once
#include "AIUtility.h"
#include "../AIUtility.h"
#include "AINodeStorage.h"
class AIPathfinder
@@ -25,4 +25,4 @@ public:
AIPathfinder(CPlayerSpecificInfoCallback * cb);
std::vector<AIPath> getPathInfo(HeroPtr hero, int3 tile);
void clear();
};
};

15
AI/VCAI/Pathfinding/AIPathfinderConfig.cpp
View File

@@ -41,13 +41,11 @@ public:
if(blocker == BlockingReason::NONE)
return;
auto srcNode = nodeStorage->getAINode(source.node);
if(blocker == BlockingReason::DESTINATION_BLOCKVIS && destination.nodeObject)
{
auto objID = destination.nodeObject->ID;
if(objID == Obj::HERO && destination.objectRelations != PlayerRelations::ENEMIES
|| objID == Obj::SUBTERRANEAN_GATE || objID == Obj::MONOLITH_TWO_WAY
if((objID == Obj::HERO && destination.objectRelations != PlayerRelations::ENEMIES)
|| objID == Obj::SUBTERRANEAN_GATE || objID == Obj::MONOLITH_TWO_WAY
|| objID == Obj::MONOLITH_ONE_WAY_ENTRANCE || objID == Obj::MONOLITH_ONE_WAY_EXIT
|| objID == Obj::WHIRLPOOL)
{
@@ -202,7 +200,8 @@ public:
const PathfinderConfig * pathfinderConfig,
CPathfinderHelper * pathfinderHelper) const override
{
auto blocker = getBlockingReason(source, destination, pathfinderConfig, pathfinderHelper);
//FIXME: unused
// auto blocker = getBlockingReason(source, destination, pathfinderConfig, pathfinderHelper);
if(source.guarded)
{
@@ -234,7 +233,7 @@ public:
};
std::vector<std::shared_ptr<IPathfindingRule>> makeRuleset(
CPlayerSpecificInfoCallback * cb,
CPlayerSpecificInfoCallback * cb,
std::shared_ptr<AINodeStorage> nodeStorage)
{
std::vector<std::shared_ptr<IPathfindingRule>> rules = {
@@ -250,8 +249,8 @@ std::vector<std::shared_ptr<IPathfindingRule>> makeRuleset(
}
AIPathfinderConfig::AIPathfinderConfig(
CPlayerSpecificInfoCallback * cb,
CPlayerSpecificInfoCallback * cb,
std::shared_ptr<AINodeStorage> nodeStorage)
:PathfinderConfig(nodeStorage, makeRuleset(cb, nodeStorage))
{
}
}