diff options
Diffstat (limited to 'node/explosedicenode.cpp')
| -rw-r--r-- | node/explosedicenode.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/node/explosedicenode.cpp b/node/explosedicenode.cpp index bdde83b..81e80ee 100644 --- a/node/explosedicenode.cpp +++ b/node/explosedicenode.cpp @@ -8,13 +8,13 @@ ExploseDiceNode::ExploseDiceNode() void ExploseDiceNode::run(ExecutionNode* previous) { m_previousNode = previous; - if((nullptr!=previous)&&(nullptr!=previous->getResult())) + if((NULL!=previous)&&(NULL!=previous->getResult())) { DiceResult* previous_result = static_cast<DiceResult*>(previous->getResult()); m_result->setPrevious(previous_result); - if(nullptr!=previous_result) + if(NULL!=previous_result) { - for(Die* die : previous_result->getResultList()) + foreach(Die* die,previous_result->getResultList()) { Die* tmpdie = new Die(); *tmpdie=*die; @@ -25,7 +25,7 @@ void ExploseDiceNode::run(ExecutionNode* previous) QList<Die*> list = m_diceResult->getResultList(); - for(Die* die : list) + foreach(Die* die, list) { while(m_validator->hasValid(die,false)) { @@ -34,7 +34,7 @@ void ExploseDiceNode::run(ExecutionNode* previous) } // m_diceResult->setResultList(list); - if(nullptr!=m_nextNode) + if(NULL!=m_nextNode) { m_nextNode->run(this); } @@ -68,19 +68,21 @@ qint64 ExploseDiceNode::getPriority() const qint64 priority=0; if(nullptr!=m_previousNode) { - priority = m_previousNode->getPriority(); + priority = m_nextNode->getPriority(); } + + return priority; } ExecutionNode* ExploseDiceNode::getCopy() const { ExploseDiceNode* node = new ExploseDiceNode(); - if(nullptr!=m_validator) + if(NULL!=m_validator) { node->setValidator(m_validator->getCopy()); } - if(nullptr!=m_nextNode) + if(NULL!=m_nextNode) { node->setNextNode(m_nextNode->getCopy()); } |