diff options
| author |   Renaud G <renaud@rolisteam.org> | 2018-03-18 17:47:33 +0100 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2018-03-18 17:47:33 +0100 |
| commit | fb81611be9f888aec9b9eb454c533dab90bc015f (patch) | |
| tree | f1fa6a27e93a38fa1d1682fc2a4c61933e40410e /node/mergenode.cpp | |
| parent | 8e2f96053a4fb57f82a59fffbfa4178168455e9f (diff) | |
| download | OneRoll-fb81611be9f888aec9b9eb454c533dab90bc015f.tar.gz OneRoll-fb81611be9f888aec9b9eb454c533dab90bc015f.zip | |
-fix some priority nodes
Diffstat (limited to 'node/mergenode.cpp')
| -rw-r--r-- | node/mergenode.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/node/mergenode.cpp b/node/mergenode.cpp index e2d46cb..f808854 100644 --- a/node/mergenode.cpp +++ b/node/mergenode.cpp @@ -50,7 +50,7 @@ void MergeNode::run(ExecutionNode* previous) DiceResult* dice = dynamic_cast<DiceResult*>(tmpResult); if(nullptr!=dice) { - ///@todo improve here to set homogeneous while is really + ///@todo TODO improve here to set homogeneous while is really m_diceResult->setHomogeneous(false); for(Die* die : dice->getResultList()) { @@ -112,9 +112,9 @@ QString MergeNode::toString(bool withLabel) const qint64 MergeNode::getPriority() const { qint64 priority=0; - if(nullptr!=m_nextNode) + if(nullptr!=m_previousNode) { - priority = m_nextNode->getPriority(); + priority = m_previousNode->getPriority(); } return priority; } @@ -126,7 +126,6 @@ ExecutionNode* MergeNode::getCopy() const node->setNextNode(m_nextNode->getCopy()); } return node; - } std::vector<ExecutionNode *>* MergeNode::getStartList() const |