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

Nullkiller: fix/refactor temporary bonus nodes, fix gather army quest completion

Browse Source
This commit is contained in:
Andrii Danylchenko
2021-05-23 14:28:43 +03:00
committed by Andrii Danylchenko
parent ae67ef027a
commit d47564955e
11 changed files with 60 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/HeroBonus.cpp
View File

@@ -989,12 +989,17 @@ std::shared_ptr<Bonus> CBonusSystemNode::update(const std::shared_ptr<Bonus> & b
}
CBonusSystemNode::CBonusSystemNode()
:CBonusSystemNode(false)
{
}
CBonusSystemNode::CBonusSystemNode(bool isHypotetic)
: bonuses(true),
exportedBonuses(true),
nodeType(UNKNOWN),
cachedLast(0),
sync(),
isHypotheticNode(false)
isHypotheticNode(isHypotetic)
{
}
@@ -1015,17 +1020,20 @@ CBonusSystemNode::CBonusSystemNode(CBonusSystemNode && other):
description(other.description),
cachedLast(0),
sync(),
isHypotheticNode(false)
isHypotheticNode(other.isHypotheticNode)
{
std::swap(parents, other.parents);
std::swap(children, other.children);
//fixing bonus tree without recalculation
for(CBonusSystemNode * n : parents)
if(!isHypothetic())
{
n->children -= &other;
n->children.push_back(this);
for(CBonusSystemNode * n : parents)
{
n->children -= &other;
n->children.push_back(this);
}
}
for(CBonusSystemNode * n : children)