games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-09-16 09:26:28 +02:00
Code Issues Releases Activity

Sonar: merge ifs

Browse Source
This commit is contained in:
Mircea TheHonestCTO
2025-08-11 21:16:44 +02:00
parent e2b688fe3e
commit 58e537a8c5
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
client/battle/BattleFieldController.cpp
View File

@@ -375,18 +375,15 @@ BattleHexArray BattleFieldController::getHighlightedHexesForMovementTarget()
auto hoveredStack = owner.getBattle()->battleGetStackByPos(hoveredHex, true);
if(owner.getBattle()->battleCanAttack(stack, hoveredStack, hoveredHex))
if(owner.getBattle()->battleCanAttack(stack, hoveredStack, hoveredHex) && isTileAttackable(hoveredHex))
{
if(isTileAttackable(hoveredHex))
BattleHex attackFromHex = fromWhichHexAttack(hoveredHex);
if(owner.getBattle()->battleCanAttack(stack, hoveredStack, attackFromHex))
{
BattleHex attackFromHex = fromWhichHexAttack(hoveredHex);
if(owner.getBattle()->battleCanAttack(stack, hoveredStack, attackFromHex))
{
if(stack->doubleWide())
return {attackFromHex, stack->occupiedHex(attackFromHex)};
if(stack->doubleWide())
return {attackFromHex, stack->occupiedHex(attackFromHex)};
return {attackFromHex};
}
return {attackFromHex};
}
}