games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-19 21:10:12 +02:00
Code Issues Releases Activity

cleanup of CBonusSystemNode::removeBonusesRecursive

Browse Source
This commit is contained in:
Henning Koehler 2018-03-06 00:03:14 +13:00 committed by ArseniyShestakov
parent 6263c4c3eb
commit e455d97fc7
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/HeroBonus.cpp
View File

@ -791,14 +791,10 @@ void CBonusSystemNode::detachFrom(CBonusSystemNode *parent)
CBonusSystemNode::treeHasChanged(); CBonusSystemNode::treeHasChanged();
} }
void CBonusSystemNode::removeBonusesRecursive(const CSelector &s) void CBonusSystemNode::removeBonusesRecursive(const CSelector & s)
{ {
BonusList bl; removeBonuses(s);
exportedBonuses.getBonuses(bl, s, Selector::all); for(CBonusSystemNode * child : children)
for(auto b : bl)
removeBonus(b);
for(CBonusSystemNode *child : children)
child->removeBonusesRecursive(s); child->removeBonusesRecursive(s);
} }
@ -850,10 +846,10 @@ void CBonusSystemNode::removeBonus(const std::shared_ptr<Bonus>& b)
CBonusSystemNode::treeHasChanged(); CBonusSystemNode::treeHasChanged();
} }
void CBonusSystemNode::removeBonuses(const CSelector &selector) void CBonusSystemNode::removeBonuses(const CSelector & selector)
{ {
BonusList toRemove; BonusList toRemove;
exportedBonuses.getBonuses(toRemove, selector); exportedBonuses.getBonuses(toRemove, selector, Selector::all);
for(auto bonus : toRemove) for(auto bonus : toRemove)
removeBonus(bonus); removeBonus(bonus);
} }

4
lib/HeroBonus.h
View File

@ -709,8 +709,8 @@ public:
void propagateBonus(std::shared_ptr<Bonus> b); void propagateBonus(std::shared_ptr<Bonus> b);
void unpropagateBonus(std::shared_ptr<Bonus> b); void unpropagateBonus(std::shared_ptr<Bonus> b);
void removeBonus(const std::shared_ptr<Bonus>& b); void removeBonus(const std::shared_ptr<Bonus>& b);
void removeBonuses(const CSelector &selector); void removeBonuses(const CSelector & selector);
void removeBonusesRecursive(const CSelector &s); void removeBonusesRecursive(const CSelector & s);
void newRedDescendant(CBonusSystemNode *descendant); //propagation needed void newRedDescendant(CBonusSystemNode *descendant); //propagation needed
void removedRedDescendant(CBonusSystemNode *descendant); //de-propagation needed void removedRedDescendant(CBonusSystemNode *descendant); //de-propagation needed