games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-01 23:12:49 +02:00
Code Issues Releases Activity

Fixed ending of battles due to retreat/surrender

Browse Source
This commit is contained in:
Ivan Savenko
2023-08-22 20:57:58 +03:00
parent a852236602
commit 81242d3500
7 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/battle/BattleAction.cpp
View File

@@ -205,7 +205,6 @@ bool BattleAction::isUnitAction() const
EActionType::BAD_MORALE,
EActionType::STACK_HEAL
};
return vstd::contains(actions, actionType);
}
@@ -215,7 +214,15 @@ bool BattleAction::isSpellAction() const
EActionType::HERO_SPELL,
EActionType::MONSTER_SPELL
};
return vstd::contains(actions, actionType);
}
bool BattleAction::isBattleEndAction() const
{
static const std::array<EActionType, 2> actions = {
EActionType::RETREAT,
EActionType::SURRENDER
};
return vstd::contains(actions, actionType);
}
@@ -227,7 +234,6 @@ bool BattleAction::isTacticsAction() const
EActionType::RETREAT,
EActionType::SURRENDER
};
return vstd::contains(actions, actionType);
}