games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-23 21:29:13 +02:00
Code Issues Releases Activity

#1083 should be fixed.

Browse Source 
To be released as dev build 0.89d.
This commit is contained in:
Michał W. Urbańczyk 2012-09-29 20:25:54 +00:00
parent 77710eaffb
commit dec3f9afd9
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/CBattleCallback.cpp
View File

@ -1054,6 +1054,12 @@ AccessibilityInfo CBattleInfoCallback::getAccesibility() const
ret[BattleHex(0, y)] = EAccessibility::SIDE_COLUMN; ret[BattleHex(0, y)] = EAccessibility::SIDE_COLUMN;
} }
//gate -> should be before stacks
if(battleGetSiegeLevel() > 0 && battleGetWallState(EWallParts::GATE) < 3) //gate is not destroyed
{
ret[95] = ret[96] = EAccessibility::GATE; //block gate's hexes
}
//tiles occupied by standing stacks //tiles occupied by standing stacks
BOOST_FOREACH(auto stack, battleAliveStacks()) BOOST_FOREACH(auto stack, battleAliveStacks())
{ {
@ -1086,12 +1092,6 @@ AccessibilityInfo CBattleInfoCallback::getAccesibility() const
if(battleGetWallState(lockedIfNotDestroyed[b].first) < 3) if(battleGetWallState(lockedIfNotDestroyed[b].first) < 3)
ret[lockedIfNotDestroyed[b].second] = EAccessibility::DESTRUCTIBLE_WALL; ret[lockedIfNotDestroyed[b].second] = EAccessibility::DESTRUCTIBLE_WALL;
} }
//gate
if(battleGetWallState(7) < 3) //if it attacker's unit and gate is not destroyed
{
ret[95] = ret[96] = EAccessibility::GATE; //block gate's hexes
}
} }
return ret; return ret;
@ -2196,9 +2196,12 @@ bool AccessibilityInfo::accessible(BattleHex tile, bool doubleWide, bool attacke
{ {
// All hexes that stack would cover if standing on tile have to be accessible. // All hexes that stack would cover if standing on tile have to be accessible.
BOOST_FOREACH(auto hex, CStack::getHexes(tile, doubleWide, attackerOwned)) BOOST_FOREACH(auto hex, CStack::getHexes(tile, doubleWide, attackerOwned))
if(!hex.isValid() || at(hex) != EAccessibility::ACCESSIBLE) {
const bool markedAccessible = at(hex) == EAccessibility::ACCESSIBLE;
const bool gateAccessible = (at(hex) == EAccessibility::GATE) && !attackerOwned; //defender can always step on gate
if(!hex.isValid() || (!markedAccessible && !gateAccessible))
return false; return false;
}
return true; return true;
} }