games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00
Code Issues Releases Activity

Try fix bypassing destroyed fort drawbridge

Browse Source
This commit is contained in:
Andrii Danylchenko
2020-11-21 19:01:42 +02:00
parent eb011e59c4
commit af192b8efe
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/battle/CBattleInfoCallback.cpp
View File

@ -1161,7 +1161,7 @@ ReachabilityInfo CBattleInfoCallback::makeBFS(const AccessibilityInfo &accessibi
if(!params.startPosition.isValid()) //if got call for arrow turrets if(!params.startPosition.isValid()) //if got call for arrow turrets
return ret; return ret;
const std::set<BattleHex> quicksands = getStoppers(params.perspective); const std::set<BattleHex> obstacles = getStoppers(params.perspective);
std::queue<BattleHex> hexq; //bfs queue std::queue<BattleHex> hexq; //bfs queue
@ -1178,10 +1178,18 @@ ReachabilityInfo CBattleInfoCallback::makeBFS(const AccessibilityInfo &accessibi
const BattleHex curHex = hexq.front(); const BattleHex curHex = hexq.front();
hexq.pop(); hexq.pop();
//walking stack can't step past the quicksands //walking stack can't step past the obstacles
//TODO what if second hex of two-hex creature enters quicksand //TODO what if second hex of two-hex creature enters obstacles
if(curHex != params.startPosition && vstd::contains(quicksands, curHex)) if(curHex != params.startPosition && vstd::contains(obstacles, curHex))
{
if(curHex == ESiegeHex::GATE_BRIDGE)
{
if(battleGetGateState() != EGateState::DESTROYED && params.side == BattleSide::ATTACKER)
continue; continue;
}
else
continue;
}
const int costToNeighbour = ret.distances[curHex.hex] + 1; const int costToNeighbour = ret.distances[curHex.hex] + 1;
for(BattleHex neighbour : BattleHex::neighbouringTilesCache[curHex.hex]) for(BattleHex neighbour : BattleHex::neighbouringTilesCache[curHex.hex])