From 23900ee4a93c79451425864f2743a856d57461b9 Mon Sep 17 00:00:00 2001 From: Renaud G Date: Sun, 18 Mar 2018 17:40:47 +0100 Subject: -Add node as parameter of condition --- operationcondition.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'operationcondition.h') diff --git a/operationcondition.h b/operationcondition.h index c3da827..2c4c4e7 100644 --- a/operationcondition.h +++ b/operationcondition.h @@ -24,17 +24,20 @@ #include #include "validator.h" #include "booleancondition.h" +#include "node/executionnode.h" class OperationCondition : public Validator { public: enum ConditionOperator { Modulo }; OperationCondition(); + virtual ~OperationCondition(); virtual qint64 hasValid(Die* b,bool recursive, bool unhighlight = false) const; void setOperator(ConditionOperator m); - void setValue(qint64); + //void setValue(qint64); + void setValueNode(ExecutionNode* node); QString toString(); virtual quint64 getValidRangeSize(quint64 faces) const; @@ -43,10 +46,13 @@ public: void setBoolean(BooleanCondition *boolean); virtual Validator* getCopy() const; +private: + qint64 valueToScalar() const; private: ConditionOperator m_operator; - BooleanCondition* m_boolean; - qint64 m_value; + BooleanCondition* m_boolean = nullptr; + //qint64 m_value; + ExecutionNode* m_value = nullptr; }; #endif // OPERATIONCONDITION_H -- cgit v1.2.3-70-g09d2