games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

nullkiller2: Ivan PR review: Remove invalid attack position validation log and return empty attackable tiles

Browse Source
This commit is contained in:
Mircea TheHonestCTO
2025-11-15 17:47:44 +01:00
parent 463ab631f8
commit b3d65ffc44
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/battle/CBattleInfoCallback.cpp
View File

@@ -1409,19 +1409,6 @@ AttackableTiles CBattleInfoCallback::getPotentiallyAttackableHexes(
if(attacker->doubleWide() && !vstd::contains(defender->getSurroundingHexes(defenderPos), attackOriginHex))
attackOriginHex = attacker->occupiedHex(attackOriginHex);
if (!vstd::contains(defender->getSurroundingHexes(defenderPos), attackOriginHex))
{
// Fixed in PR #6016 but left as a graceful error log instead of a runtime exception that crashes
logGlobal->error(
"Attempt to attack from invalid position! defenderPos (%d, %d) attackOriginHex (%d, %d)",
defenderPos.getX(),
defenderPos.getY(),
attackOriginHex.getX(),
attackOriginHex.getY()
);
return AttackableTiles();
}
auto attackDirection = BattleHex::mutualPosition(attackOriginHex, defenderPos);
// If defender is double-wide, attacker always prefers targeting its 'tail', if it is reachable