games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

fix boat assert

Browse Source
This commit is contained in:
Laserlicht
2025-11-02 21:26:49 +01:00
parent 743013a0d6
commit 60dacab361
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/bonuses/CBonusSystemNode.cpp
View File

@@ -184,6 +184,7 @@ CBonusSystemNode::~CBonusSystemNode()
void CBonusSystemNode::attachTo(CBonusSystemNode & parent) void CBonusSystemNode::attachTo(CBonusSystemNode & parent)
{ {
assert(!vstd::contains(parentsToPropagate, &parent));
parentsToPropagate.push_back(&parent); parentsToPropagate.push_back(&parent);
attachToSource(parent); attachToSource(parent);
@@ -193,6 +194,7 @@ void CBonusSystemNode::attachTo(CBonusSystemNode & parent)
if(!parent.actsAsBonusSourceOnly()) if(!parent.actsAsBonusSourceOnly())
newRedDescendant(parent); newRedDescendant(parent);
assert(!vstd::contains(parent.children, this));
parent.children.push_back(this); parent.children.push_back(this);
} }
@@ -201,6 +203,7 @@ void CBonusSystemNode::attachTo(CBonusSystemNode & parent)
void CBonusSystemNode::attachToSource(const CBonusSystemNode & parent) void CBonusSystemNode::attachToSource(const CBonusSystemNode & parent)
{ {
assert(!vstd::contains(parentsToInherit, &parent));
parentsToInherit.push_back(&parent); parentsToInherit.push_back(&parent);
++globalCounter; ++globalCounter;

1
lib/mapObjects/CGHeroInstance.cpp
View File

@@ -1319,7 +1319,6 @@ void CGHeroInstance::setBoat(CGBoat* newBoat)
if (newBoat) if (newBoat)
{ {
boardedBoat = newBoat->id; boardedBoat = newBoat->id;
attachTo(*newBoat);
newBoat->setBoardedHero(this); newBoat->setBoardedHero(this);
} }
else if (boardedBoat.hasValue()) else if (boardedBoat.hasValue())