games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

Remove strange & unused double-selector logic

Browse Source
This commit is contained in:
Ivan Savenko
2025-06-24 12:06:23 +03:00
parent 2d24c28996
commit 1e3e2f665c
39 changed files with 71 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/bonuses/BonusList.cpp
View File

@@ -172,11 +172,11 @@ std::shared_ptr<const Bonus> BonusList::getFirst(const CSelector &selector) cons
return nullptr;
}
void BonusList::getBonuses(BonusList & out, const CSelector &selector, const CSelector &limit) const
void BonusList::getBonuses(BonusList & out, const CSelector &selector) const
{
for(const auto & b : bonuses)
{
if(selector(b.get()) && (!limit || ((bool)limit && limit(b.get()))))
if(selector(b.get()))
out.push_back(b);
}
}
@@ -190,8 +190,7 @@ void BonusList::getAllBonuses(BonusList &out) const
int BonusList::valOfBonuses(const CSelector &select, int baseValue) const
{
BonusList ret;
CSelector limit = nullptr;
getBonuses(ret, select, limit);
getBonuses(ret, select);
return ret.totalValue(baseValue);
}