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

Unified handling of battle sides ID's

Browse Source 
- Replaced BattleSide namespace-enum with enum class
- Merged two different BattleSide enum's into one
- Merged BattlePerspective enum into BattleSide enum
- Changed all places that use integers to represent battle side to use
BattleSide enum
- Added BattleSideArray convenience wrapper for std::array that is
always 2-elements in size and allows access to its elements using
BattleSide enum
This commit is contained in:
Ivan Savenko
2024-08-11 20:22:35 +00:00
parent 9b914bb4db
commit 2a05fbdd50
95 changed files with 601 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server/queries/BattleQueries.cpp
View File

@@ -35,17 +35,18 @@ CBattleQuery::CBattleQuery(CGameHandler * owner, const IBattleInfo * bi):
CQuery(owner),
battleID(bi->getBattleID())
{
belligerents[0] = bi->getSideArmy(0);
belligerents[1] = bi->getSideArmy(1);
belligerents[BattleSide::ATTACKER] = bi->getSideArmy(BattleSide::ATTACKER);
belligerents[BattleSide::DEFENDER] = bi->getSideArmy(BattleSide::DEFENDER);
addPlayer(bi->getSidePlayer(0));
addPlayer(bi->getSidePlayer(1));
addPlayer(bi->getSidePlayer(BattleSide::ATTACKER));
addPlayer(bi->getSidePlayer(BattleSide::DEFENDER));
}
CBattleQuery::CBattleQuery(CGameHandler * owner):
CQuery(owner)
{
belligerents[0] = belligerents[1] = nullptr;
belligerents[BattleSide::ATTACKER] = nullptr;
belligerents[BattleSide::DEFENDER] = nullptr;
}
bool CBattleQuery::blocksPack(const CPack * pack) const
@@ -81,8 +82,8 @@ CBattleDialogQuery::CBattleDialogQuery(CGameHandler * owner, const IBattleInfo *
bi(bi),
result(Br)
{
addPlayer(bi->getSidePlayer(0));
addPlayer(bi->getSidePlayer(1));
addPlayer(bi->getSidePlayer(BattleSide::ATTACKER));
addPlayer(bi->getSidePlayer(BattleSide::DEFENDER));
}
void CBattleDialogQuery::onRemoval(PlayerColor color)
@@ -97,11 +98,11 @@ void CBattleDialogQuery::onRemoval(PlayerColor color)
{
gh->battles->restartBattlePrimary(
bi->getBattleID(),
bi->getSideArmy(0),
bi->getSideArmy(1),
bi->getSideArmy(BattleSide::ATTACKER),
bi->getSideArmy(BattleSide::DEFENDER),
bi->getLocation(),
bi->getSideHero(0),
bi->getSideHero(1),
bi->getSideHero(BattleSide::ATTACKER),
bi->getSideHero(BattleSide::DEFENDER),
bi->isCreatureBank(),
bi->getDefendedTown()
);