games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity

Merge pull request #6386 from mrhaandi/cleaner-unpropagation

Browse Source 
Restructure unpropagation logic
This commit is contained in:
Ivan Savenko
2025-12-05 22:10:27 +02:00
committed by GitHub
parent 0373691f3a 991d047000
commit 2e6c0ef20c
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/bonuses/CBonusSystemNode.cpp
+13 -13
View File
@@ -366,7 +366,7 @@ void CBonusSystemNode::propagateBonus(const std::shared_ptr<Bonus> & b, const CB
? source.getUpdatedBonus(b, b->propagationUpdater)
: b;
bonuses.push_back(propagated);
logBonus->trace("#$# %s #propagated to# %s", propagated->Description(nullptr), nodeName());
logBonus->trace("#$# %s #propagated to# %s", propagated->Description(nullptr), nodeName());
invalidateChildrenNodes(globalCounter);
}
@@ -380,20 +380,20 @@ void CBonusSystemNode::unpropagateBonus(const std::shared_ptr<Bonus> & b)
{
if(b->propagator->shouldBeAttached(this))
{
if (bonuses -= b)
logBonus->trace("#$# %s #is no longer propagated to# %s", b->Description(nullptr), nodeName());
else
logBonus->warn("Attempt to remove #$# %s, which is not propagated to %s", b->Description(nullptr), nodeName());
bonuses.remove_if([b](const auto & bonus)
if (b->propagationUpdater)
{
if (bonus->propagationUpdater && bonus->propagationUpdater == b->propagationUpdater)
bonuses.remove_if([b](const auto & bonus)
{
return true;
}
return false;
});
return bonus->propagationUpdater && bonus->propagationUpdater == b->propagationUpdater;
});
}
else
{
if (bonuses -= b)
logBonus->trace("#$# %s #is no longer propagated to# %s", b->Description(nullptr), nodeName());
else
logBonus->warn("Attempt to remove #$# %s, which is not propagated to %s", b->Description(nullptr), nodeName());
}
invalidateChildrenNodes(globalCounter);
}