diff options
| author |   Renaud G <renaud@rolisteam.org> | 2017-11-12 16:28:40 +0100 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2017-11-12 16:28:40 +0100 |
| commit | 2a8fd91924799e713c79f8a8e7d9edc94574a6ca (patch) | |
| tree | 6af720571119ef395a39fe3f6fff5d52ce09e3cf /node/ifnode.cpp | |
| parent | cedc70618afa6826d409a64078ea1a8ede4af06c (diff) | |
| parent | bbc6f032bf8f182e6e4e97c7afddf47a3fb8a911 (diff) | |
| download | OneRoll-2a8fd91924799e713c79f8a8e7d9edc94574a6ca.tar.gz OneRoll-2a8fd91924799e713c79f8a8e7d9edc94574a6ca.zip | |
update diceparser
Diffstat (limited to 'node/ifnode.cpp')
| -rw-r--r-- | node/ifnode.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/node/ifnode.cpp b/node/ifnode.cpp index b40ed82..b15e203 100644 --- a/node/ifnode.cpp +++ b/node/ifnode.cpp @@ -60,7 +60,7 @@ void IfNode::run(ExecutionNode *previous) for(Die* dice : diceList) { if(m_validator->hasValid(dice,true,true)) - { + { nextNode = (nullptr==m_true) ? nullptr: m_true->getCopy(); } else @@ -245,7 +245,12 @@ QString IfNode::toString(bool wl) const qint64 IfNode::getPriority() const { - return 4; + qint64 priority=0; + if(nullptr != getPreviousNode()) + { + priority=getPreviousNode()->getPriority(); + } + return priority; } ExecutionNode* IfNode::getLeafNode(ExecutionNode* node) |