aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/node/ifnode.cpp
diff options
context:
space:
mode:
authorRenaud Guezennec <renaud.guezennec@softbankrobotics.com>2017-11-28 11:26:09 +0100
committerRenaud Guezennec <renaud.guezennec@softbankrobotics.com>2017-11-28 11:26:09 +0100
commitf0ade121f9cef3b39c41816536f4e400f43dd4af (patch)
treedb484da8c9bf02ecdf86e117def96f555191787b /node/ifnode.cpp
parent4516fab0081b0db73b7401816a521453ab77ecc6 (diff)
downloadOneRoll-f0ade121f9cef3b39c41816536f4e400f43dd4af.tar.gz
OneRoll-f0ade121f9cef3b39c41816536f4e400f43dd4af.zip
-fix copy of if operator
Compare method was not shared.
Diffstat (limited to 'node/ifnode.cpp')
-rw-r--r--node/ifnode.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/node/ifnode.cpp b/node/ifnode.cpp
index a74667d..c037121 100644
--- a/node/ifnode.cpp
+++ b/node/ifnode.cpp
@@ -21,7 +21,7 @@
#include "result/diceresult.h"
IfNode::IfNode()
- : m_validator(nullptr),m_true(nullptr),m_false(nullptr),m_conditionType(AllOfThem)
+ : m_validator(nullptr),m_conditionType(AllOfThem),m_true(nullptr),m_false(nullptr)
{
//m_result = new DiceResult();
}
@@ -96,12 +96,10 @@ void IfNode::run(ExecutionNode *previous)
bool result = m_validator->hasValid(dice,true,true);
trueForAll = trueForAll ? result : false;
falseForAll = falseForAll ? result : false;
- qDebug() << "result" << result;
oneIsTrue |= result;
oneIsFalse = !result ? true : oneIsFalse;
}
- qDebug() << "OneIsVrai: " << oneIsTrue <<" oneIsFaux" <<oneIsFalse<<" vraiForAll" <<trueForAll <<" fauxForAll" <<falseForAll << m_conditionType;
if(m_conditionType==OneOfThem)
{
if(oneIsTrue)
@@ -272,6 +270,8 @@ void IfNode::setConditionType(const IfNode::ConditionType &conditionType)
ExecutionNode* IfNode::getCopy() const
{
IfNode* node = new IfNode();
+
+ node->setConditionType(m_conditionType);
if(nullptr!=m_validator)
{
node->setValidator(m_validator->getCopy());