1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-12 02:28:11 +02:00

A bunch of fixes for recent branch.

This commit is contained in:
DJWarmonger 2018-08-21 17:42:16 +02:00
parent 6503830bde
commit 383c9a20af

View File

@ -1142,12 +1142,9 @@ TGoalVec Goals::CollectRes::getAllPossibleSubgoals()
} }
for (auto obj : ourObjs) for (auto obj : ourObjs)
{ {
auto pos = obj->visitablePos(); auto pos = obj->visitablePos();
if (ai->isAccessibleForHero(pos, h)) if (ai->isTileNotReserved(h, pos)) //further decomposition and evaluation will be handled by VisitObj
{ ret.push_back(sptr(Goals::VisitObj(obj->id.getNum()).sethero(h).setisAbstract(true)));
if (ai->isTileNotReserved(h, pos)) //further decomposition and evaluation will be handled by VisitObj
ret.push_back(sptr(Goals::VisitObj(obj->id.getNum()).sethero(h).setisAbstract(true)));
}
} }
} }
return ret; return ret;