aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/node/sortresult.cpp
diff options
context:
space:
mode:
authorRenaud G <renaud@rolisteam.org>2017-11-12 16:28:40 +0100
committerRenaud G <renaud@rolisteam.org>2017-11-12 16:28:40 +0100
commit2a8fd91924799e713c79f8a8e7d9edc94574a6ca (patch)
tree6af720571119ef395a39fe3f6fff5d52ce09e3cf /node/sortresult.cpp
parentcedc70618afa6826d409a64078ea1a8ede4af06c (diff)
parentbbc6f032bf8f182e6e4e97c7afddf47a3fb8a911 (diff)
downloadOneRoll-2a8fd91924799e713c79f8a8e7d9edc94574a6ca.tar.gz
OneRoll-2a8fd91924799e713c79f8a8e7d9edc94574a6ca.zip
update diceparser
Diffstat (limited to 'node/sortresult.cpp')
-rw-r--r--node/sortresult.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/node/sortresult.cpp b/node/sortresult.cpp
index 5406eb6..062e1d2 100644
--- a/node/sortresult.cpp
+++ b/node/sortresult.cpp
@@ -57,7 +57,7 @@ void SortResultNode::run(ExecutionNode* node)
bool found = false;
int start = 0;
int end = diceList2.size();
- Die* tmp2 = nullptr;
+ Die* tmp2 = NULL;
while(!found)
{
int distance = end-start;
@@ -92,7 +92,7 @@ void SortResultNode::run(ExecutionNode* node)
}
m_diceResult->setResultList(diceList2);
- if(nullptr!=m_nextNode)
+ if(NULL!=m_nextNode)
{
m_nextNode->run(this);
}
@@ -123,7 +123,7 @@ QString SortResultNode::toString(bool wl) const
qint64 SortResultNode::getPriority() const
{
qint64 priority=0;
- if(nullptr!=m_nextNode)
+ if(nullptr != m_previousNode)
{
priority = m_nextNode->getPriority();
}
@@ -135,7 +135,7 @@ ExecutionNode* SortResultNode::getCopy() const
{
SortResultNode* node = new SortResultNode();
node->setSortAscending(m_ascending);
- if(nullptr!=m_nextNode)
+ if(NULL!=m_nextNode)
{
node->setNextNode(m_nextNode->getCopy());
}