games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +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

9
AI/BattleAI/StackWithBonuses.cpp
View File

@@ -133,11 +133,10 @@ SlotID StackWithBonuses::unitSlot() const
return slot;
}
TConstBonusListPtr StackWithBonuses::getAllBonuses(const CSelector & selector, const CSelector & limit,
const std::string & cachingStr) const
TConstBonusListPtr StackWithBonuses::getAllBonuses(const CSelector & selector, const std::string & cachingStr) const
{
auto ret = std::make_shared<BonusList>();
TConstBonusListPtr originalList = origBearer->getAllBonuses(selector, limit, cachingStr);
TConstBonusListPtr originalList = origBearer->getAllBonuses(selector, cachingStr);
vstd::copy_if(*originalList, std::back_inserter(*ret), [this](const std::shared_ptr<Bonus> & b)
{
@@ -147,7 +146,7 @@ TConstBonusListPtr StackWithBonuses::getAllBonuses(const CSelector & selector, c
for(const Bonus & bonus : bonusesToUpdate)
{
if(selector(&bonus) && (!limit || limit(&bonus)))
if(selector(&bonus))
{
if(ret->getFirst(Selector::source(BonusSource::SPELL_EFFECT, bonus.sid).And(Selector::typeSubtype(bonus.type, bonus.subtype))))
{
@@ -164,7 +163,7 @@ TConstBonusListPtr StackWithBonuses::getAllBonuses(const CSelector & selector, c
for(auto & bonus : bonusesToAdd)
{
auto b = std::make_shared<Bonus>(bonus);
if(selector(b.get()) && (!limit || !limit(b.get())))
if(selector(b.get()))
ret->push_back(b);
}
//TODO limiters?