mirror of
https://github.com/vcmi/vcmi.git
synced 2025-07-15 01:24:45 +02:00
Unified handling of battle sides ID's
- 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:
@ -41,7 +41,7 @@ bool Unit::isTurret() const
|
||||
std::string Unit::getDescription() const
|
||||
{
|
||||
boost::format fmt("Unit %d of side %d");
|
||||
fmt % unitId() % unitSide();
|
||||
fmt % unitId() % static_cast<int>(unitSide());
|
||||
return fmt.str();
|
||||
}
|
||||
|
||||
@ -58,7 +58,7 @@ std::vector<BattleHex> Unit::getSurroundingHexes(BattleHex assumedPosition) cons
|
||||
return getSurroundingHexes(hex, doubleWide(), unitSide());
|
||||
}
|
||||
|
||||
std::vector<BattleHex> Unit::getSurroundingHexes(BattleHex position, bool twoHex, ui8 side)
|
||||
std::vector<BattleHex> Unit::getSurroundingHexes(BattleHex position, bool twoHex, BattleSide side)
|
||||
{
|
||||
std::vector<BattleHex> hexes;
|
||||
if(twoHex)
|
||||
@ -135,7 +135,7 @@ std::vector<BattleHex> Unit::getHexes(BattleHex assumedPos) const
|
||||
return getHexes(assumedPos, doubleWide(), unitSide());
|
||||
}
|
||||
|
||||
std::vector<BattleHex> Unit::getHexes(BattleHex assumedPos, bool twoHex, ui8 side)
|
||||
std::vector<BattleHex> Unit::getHexes(BattleHex assumedPos, bool twoHex, BattleSide side)
|
||||
{
|
||||
std::vector<BattleHex> hexes;
|
||||
hexes.push_back(assumedPos);
|
||||
@ -156,7 +156,7 @@ BattleHex Unit::occupiedHex(BattleHex assumedPos) const
|
||||
return occupiedHex(assumedPos, doubleWide(), unitSide());
|
||||
}
|
||||
|
||||
BattleHex Unit::occupiedHex(BattleHex assumedPos, bool twoHex, ui8 side)
|
||||
BattleHex Unit::occupiedHex(BattleHex assumedPos, bool twoHex, BattleSide side)
|
||||
{
|
||||
if(twoHex)
|
||||
{
|
||||
|
Reference in New Issue
Block a user