diff options
| author | 2017-11-12 16:28:40 +0100 | |
|---|---|---|
| committer | 2017-11-12 16:28:40 +0100 | |
| commit | 2a8fd91924799e713c79f8a8e7d9edc94574a6ca (patch) | |
| tree | 6af720571119ef395a39fe3f6fff5d52ce09e3cf /node/keepdiceexecnode.cpp | |
| parent | cedc70618afa6826d409a64078ea1a8ede4af06c (diff) | |
| parent | bbc6f032bf8f182e6e4e97c7afddf47a3fb8a911 (diff) | |
| download | OneRoll-2a8fd91924799e713c79f8a8e7d9edc94574a6ca.tar.gz OneRoll-2a8fd91924799e713c79f8a8e7d9edc94574a6ca.zip | |
update diceparser
Diffstat (limited to 'node/keepdiceexecnode.cpp')
| -rw-r--r-- | node/keepdiceexecnode.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/node/keepdiceexecnode.cpp b/node/keepdiceexecnode.cpp index a93cc11..6167632 100644 --- a/node/keepdiceexecnode.cpp +++ b/node/keepdiceexecnode.cpp @@ -36,13 +36,13 @@ KeepDiceExecNode::~KeepDiceExecNode() void KeepDiceExecNode::run(ExecutionNode* previous) { m_previousNode = previous; - if(nullptr==previous) + if(NULL==previous) { return; } DiceResult* previousDiceResult = static_cast<DiceResult*>(previous->getResult()); m_result->setPrevious(previousDiceResult); - if(nullptr!=previousDiceResult) + if(NULL!=previousDiceResult) { QList<Die*> diceList=previousDiceResult->getResultList(); @@ -70,7 +70,7 @@ void KeepDiceExecNode::run(ExecutionNode* previous) } m_diceResult->setResultList(diceList2); - if(nullptr!=m_nextNode) + if(NULL!=m_nextNode) { m_nextNode->run(this); } @@ -94,7 +94,7 @@ QString KeepDiceExecNode::toString(bool wl) const qint64 KeepDiceExecNode::getPriority() const { qint64 priority=0; - if(nullptr!=m_nextNode) + if(nullptr!=m_previousNode) { priority = m_nextNode->getPriority(); } @@ -107,7 +107,7 @@ ExecutionNode* KeepDiceExecNode::getCopy() const { KeepDiceExecNode* node = new KeepDiceExecNode(); node->setDiceKeepNumber(m_numberOfDice); - if(nullptr!=m_nextNode) + if(NULL!=m_nextNode) { node->setNextNode(m_nextNode->getCopy()); } |