1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00

Fixed what merge-conflict-handling had broken.

Restored exploration-without relying on memory but with included whirlpool
This commit is contained in:
Xilmi
2024-07-24 15:21:17 +02:00
parent b83a214763
commit 34e4ab45ee

View File

@@ -51,9 +51,7 @@ Goals::TGoalVec ExplorationBehavior::decompose(const Nullkiller * ai) const
case Obj::WHIRLPOOL:
{
auto tObj = dynamic_cast<const CGTeleport*>(obj);
if(TeleportChannel::IMPASSABLE == ai->memory->knownTeleportChannels[tObj->channel]->passability)
break;
for(auto exit : ai->memory->knownTeleportChannels[tObj->channel]->exits)
for (auto exit : cb->getTeleportChannelExits(tObj->channel))
{
if (exit != tObj->id)
{
@@ -63,7 +61,6 @@ Goals::TGoalVec ExplorationBehavior::decompose(const Nullkiller * ai) const
}
}
}
}
auto heroes = ai->cb->getHeroesInfo();