games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity

Fix compilation failure

Browse Source 
Caused by merge of 2 independent PR's - one removed macro, another added its usage
This commit is contained in:
Ivan Savenko
2026-06-02 18:56:50 +03:00
parent d9940950ee
commit 4e605b84d5
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AI/Nullkiller2/Pathfinding/AINodeStorage.h
+8 -8
View File
@@ -50,7 +50,7 @@ struct AIPathNode : public CGPathNode
void addSpecialAction(std::shared_ptr<const SpecialAction> action);
STRONG_INLINE void reset(EPathfindingLayer layer, EPathAccessibility accessibility)
inline void reset(EPathfindingLayer layer, EPathAccessibility accessibility)
{
CGPathNode::reset();
@@ -214,26 +214,26 @@ public:
float cost,
bool saveToCommitted = true) const;
STRONG_INLINE const AIPathNode * getAINode(const CGPathNode * node) const
inline const AIPathNode * getAINode(const CGPathNode * node) const
{
return static_cast<const AIPathNode *>(node);
}
STRONG_INLINE void updateAINode(CGPathNode * node, std::function<void (AIPathNode *)> updater)
inline void updateAINode(CGPathNode * node, std::function<void (AIPathNode *)> updater)
{
auto * aiNode = static_cast<AIPathNode *>(node);
updater(aiNode);
}
STRONG_INLINE const CGHeroInstance * getHero(const CGPathNode * node) const
inline const CGHeroInstance * getHero(const CGPathNode * node) const
{
const auto * aiNode = getAINode(node);
return aiNode->actor->hero;
}
STRONG_INLINE bool blocked(const int3 & tile, EPathfindingLayer layer) const
inline bool blocked(const int3 & tile, EPathfindingLayer layer) const
{
EPathAccessibility accessible = getAccessibility(tile, layer);
@@ -278,12 +278,12 @@ public:
uint64_t evaluateArmyLoss(const CGHeroInstance * hero, uint64_t armyValue, uint64_t danger) const;
STRONG_INLINE EPathAccessibility getAccessibility(const int3 & tile, EPathfindingLayer layer) const
inline EPathAccessibility getAccessibility(const int3 & tile, EPathfindingLayer layer) const
{
return (*this->accessibility)[tile.z][tile.x][tile.y][layer.getNum()];
}
STRONG_INLINE void resetTile(const int3 & tile, EPathfindingLayer layer, EPathAccessibility tileAccessibility)
inline void resetTile(const int3 & tile, EPathfindingLayer layer, EPathAccessibility tileAccessibility)
{
(*this->accessibility)[tile.z][tile.x][tile.y][layer.getNum()] = tileAccessibility;
}
@@ -292,7 +292,7 @@ public:
using RealMoveMasksByHero = std::map<const CGHeroInstance *, uint64_t>;
STRONG_INLINE bool isRealMovementNode(const AIPathNode * node) const
inline bool isRealMovementNode(const AIPathNode * node) const
{
return node && node->actor && node->actor->hero && node->coord != node->actor->hero->visitablePos();
}