1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00

WIP remove thread_local CCallback in HeroPtr

This commit is contained in:
Mircea TheHonestCTO
2025-09-01 04:49:21 +02:00
parent 5a8ffdeb8b
commit 13bd7ed8f4
29 changed files with 174 additions and 207 deletions

View File

@@ -173,8 +173,8 @@ void AINodeStorage::clear()
heroChainPass = EHeroChainPass::INITIAL;
heroChainTurn = 0;
heroChainMaxTurns = 1;
turnDistanceLimit[HeroRole::MAIN] = 255;
turnDistanceLimit[HeroRole::SCOUT] = 255;
turnDistanceLimit[HeroRole::MAIN] = PathfinderSettings::MaxTurnDistanceLimit;;
turnDistanceLimit[HeroRole::SCOUT] = PathfinderSettings::MaxTurnDistanceLimit;;
}
std::optional<AIPathNode *> AINodeStorage::getOrCreateNode(
@@ -1396,7 +1396,7 @@ bool AINodeStorage::isOtherChainBetter(
return false;
}
bool AINodeStorage::isTileAccessible(const HeroPtr & hero, const int3 & pos, const EPathfindingLayer layer) const
bool AINodeStorage::isTileAccessible(const HeroPtr & heroPtr, const int3 & pos, const EPathfindingLayer layer) const
{
auto chains = nodes.get(pos);
@@ -1406,7 +1406,7 @@ bool AINodeStorage::isTileAccessible(const HeroPtr & hero, const int3 & pos, con
&& node.layer == layer
&& node.action != EPathNodeAction::UNKNOWN
&& node.actor
&& node.actor->hero == hero.hero)
&& node.actor->hero == heroPtr.get())
{
return true;
}