games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-10 22:31:40 +02:00
Code Issues Releases Activity

Smarter logic for determining whether hex is inside the walls

Browse Source
This commit is contained in:
Ivan Savenko
2025-01-29 23:01:42 +00:00
parent 33f4db3c31
commit 5c8c69e665
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/battle/CBattleInfoCallback.cpp
View File

@@ -49,11 +49,6 @@ static bool sameSideOfWall(const BattleHex & pos1, const BattleHex & pos2)
return stackLeft == destLeft; return stackLeft == destLeft;
} }
static bool isInsideWalls(const BattleHex & pos)
{
return lineToWallHex(pos.getY()) <= pos;
}
// parts of wall // parts of wall
static const std::pair<int, EWallPart> wallParts[] = static const std::pair<int, EWallPart> wallParts[] =
{ {
@@ -167,7 +162,20 @@ std::pair< BattleHexArray, int > CBattleInfoCallback::getPath(const BattleHex &
bool CBattleInfoCallback::battleIsInsideWalls(const BattleHex & from) const bool CBattleInfoCallback::battleIsInsideWalls(const BattleHex & from) const
{ {
return isInsideWalls(from); BattleHex wallPos = lineToWallHex(from.getY());
if (from < wallPos)
return false;
if (wallPos < from)
return true;
// edge case - this is the wall. (or drawbridge)
// since this method is used exclusively to determine behavior of defenders,
// consider it inside walls, unless this is intact drawbridge - to prevent defenders standing on it and opening the gates
if (from == BattleHex::GATE_INNER)
return battleGetGateState() == EGateState::DESTROYED;
return true;
} }
bool CBattleInfoCallback::battleHasPenaltyOnLine(const BattleHex & from, const BattleHex & dest, bool checkWall, bool checkMoat) const bool CBattleInfoCallback::battleHasPenaltyOnLine(const BattleHex & from, const BattleHex & dest, bool checkWall, bool checkMoat) const