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

Fix crash on moving double-wide units in some obstacle configurations

Browse Source
This commit is contained in:
Ivan Savenko
2025-07-01 12:34:53 +03:00
parent 835120237d
commit bc4a1b06fc
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
client/battle/BattleActionsController.cpp
View File

@ -731,15 +731,18 @@ void BattleActionsController::actionRealize(PossiblePlayerBattleAction action, c
case PossiblePlayerBattleAction::MOVE_STACK: case PossiblePlayerBattleAction::MOVE_STACK:
{ {
const auto * activeStack = owner.stacksController->getActiveStack(); const auto * activeStack = owner.stacksController->getActiveStack();
const bool backwardsMove = activeStack->unitSide() == BattleSide::ATTACKER ?
targetHex.getX() < activeStack->getPosition().getX():
targetHex.getX() > activeStack->getPosition().getX();
if(activeStack->doubleWide() && backwardsMove) if(activeStack->doubleWide())
{ {
BattleHexArray acc = owner.getBattle()->battleGetAvailableHexes(activeStack, false); BattleHexArray availableHexes = owner.getBattle()->battleGetAvailableHexes(activeStack, false);
BattleHex shiftedDest = targetHex.cloneInDirection(activeStack->destShiftDir(), false); BattleHex shiftedDest = targetHex.cloneInDirection(activeStack->destShiftDir(), false);
if(acc.contains(shiftedDest)) const bool canMoveHeadHere = availableHexes.contains(targetHex);
const bool canMoveTailHere = availableHexes.contains(shiftedDest);
const bool backwardsMove = activeStack->unitSide() == BattleSide::ATTACKER ?
targetHex.getX() < activeStack->getPosition().getX():
targetHex.getX() > activeStack->getPosition().getX();
if(canMoveTailHere && (backwardsMove || !canMoveHeadHere))
owner.giveCommand(EActionType::WALK, shiftedDest); owner.giveCommand(EActionType::WALK, shiftedDest);
else else
owner.giveCommand(EActionType::WALK, targetHex); owner.giveCommand(EActionType::WALK, targetHex);

10
client/battle/BattleFieldController.cpp
View File

@ -392,14 +392,16 @@ BattleHexArray BattleFieldController::getHighlightedHexesForMovementTarget()
if (stack->doubleWide()) if (stack->doubleWide())
{ {
const bool canMoveHeadHere = availableHexes.contains(hoveredHex);
const bool canMoveTailHere = availableHexes.contains(hoveredHex.cloneInDirection(stack->destShiftDir()));
const bool backwardsMove = stack->unitSide() == BattleSide::ATTACKER ? const bool backwardsMove = stack->unitSide() == BattleSide::ATTACKER ?
hoveredHex.getX() < stack->getPosition().getX(): hoveredHex.getX() < stack->getPosition().getX():
hoveredHex.getX() > stack->getPosition().getX(); hoveredHex.getX() > stack->getPosition().getX();
if (backwardsMove && availableHexes.contains(hoveredHex.cloneInDirection(stack->destShiftDir()))) if(canMoveTailHere && (backwardsMove || !canMoveHeadHere))
return {hoveredHex, hoveredHex.cloneInDirection(stack->destShiftDir())}; return {hoveredHex, hoveredHex.cloneInDirection(stack->destShiftDir())};
if (availableHexes.contains(hoveredHex)) if (canMoveHeadHere)
return {hoveredHex, stack->occupiedHex(hoveredHex)}; return {hoveredHex, stack->occupiedHex(hoveredHex)};
return {}; return {};