games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'upstream/develop' into battle-dialog

Browse Source
This commit is contained in:
nordsoft
2023-04-11 02:22:42 +04:00
parent 50115c3113 ebd17c9e4a
commit bfc75ccd39
186 changed files with 1814 additions and 1257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/battle/BattleInfo.cpp
View File

@@ -24,7 +24,7 @@
VCMI_LIB_NAMESPACE_BEGIN
///BattleInfo
std::pair< std::vector<BattleHex>, int > BattleInfo::getPath(BattleHex start, BattleHex dest, const CStack * stack)
std::pair< std::vector<BattleHex>, int > BattleInfo::getPath(BattleHex start, BattleHex dest, const battle::Unit * stack)
{
auto reachability = getReachability(stack);
@@ -662,7 +662,7 @@ int32_t BattleInfo::getEnchanterCounter(ui8 side) const
return sides.at(side).enchanterCounter;
}
const IBonusBearer * BattleInfo::asBearer() const
const IBonusBearer * BattleInfo::getBonusBearer() const
{
return this;
}