games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

Remove remaining usages of CCheckProxy class

Browse Source
This commit is contained in:
Ivan Savenko
2024-12-26 16:57:05 +00:00
parent 919588f7ff
commit 39d2f27589
9 changed files with 24 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mapObjects/CArmedInstance.cpp
View File

@@ -46,7 +46,7 @@ CArmedInstance::CArmedInstance(IGameCallback *cb)
CArmedInstance::CArmedInstance(IGameCallback *cb, bool isHypothetic):
CGObjectInstance(cb),
CBonusSystemNode(isHypothetic),
nonEvilAlignmentMix(this, BonusType::NONEVIL_ALIGNMENT_MIX), // Take Angelic Alliance troop-mixing freedom of non-evil units into account.
nonEvilAlignmentMix(this, Selector::type()(BonusType::NONEVIL_ALIGNMENT_MIX)), // Take Angelic Alliance troop-mixing freedom of non-evil units into account.
battle(nullptr)
{
}
@@ -86,7 +86,7 @@ void CArmedInstance::updateMoraleBonusFromArmy()
size_t factionsInArmy = factions.size(); //town garrison seems to take both sets into account
if (nonEvilAlignmentMix.getHasBonus())
if (nonEvilAlignmentMix.hasBonus())
{
size_t mixableFactions = 0;