games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +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

8
lib/mapObjects/MiscObjects.cpp
View File

@ -205,7 +205,7 @@ ui32 CGMine::getProducedQuantity() const
void CGMine::battleFinished(const CGHeroInstance *hero, const BattleResult &result) const
{
if(result.winner == 0) //attacker won
if(result.winner == BattleSide::ATTACKER) //attacker won
{
if(isAbandoned())
{
@ -344,7 +344,7 @@ void CGResource::collectRes(const PlayerColor & player) const
void CGResource::battleFinished(const CGHeroInstance *hero, const BattleResult &result) const
{
if(result.winner == 0) //attacker won
if(result.winner == BattleSide::ATTACKER) //attacker won
collectRes(hero->getOwner());
}
@ -911,7 +911,7 @@ BattleField CGArtifact::getBattlefield() const
void CGArtifact::battleFinished(const CGHeroInstance *hero, const BattleResult &result) const
{
if(result.winner == 0) //attacker won
if(result.winner == BattleSide::ATTACKER) //attacker won
pick(hero);
}
@ -1010,7 +1010,7 @@ bool CGGarrison::passableFor(PlayerColor player) const
void CGGarrison::battleFinished(const CGHeroInstance *hero, const BattleResult &result) const
{
if (result.winner == 0)
if (result.winner == BattleSide::ATTACKER)
onHeroVisit(hero);
}