aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/operationcondition.h
diff options
context:
space:
mode:
authorRenaud G <renaud@rolisteam.org>2018-03-18 17:40:47 +0100
committerRenaud G <renaud@rolisteam.org>2018-03-18 17:40:47 +0100
commit23900ee4a93c79451425864f2743a856d57461b9 (patch)
tree390400811833d6dbe7ec8278160086a76213cd38 /operationcondition.h
parent5ff5516c8cab5599375234a9a1898b737e8541f2 (diff)
downloadOneRoll-23900ee4a93c79451425864f2743a856d57461b9.tar.gz
OneRoll-23900ee4a93c79451425864f2743a856d57461b9.zip
-Add node as parameter of condition
Diffstat (limited to 'operationcondition.h')
-rw-r--r--operationcondition.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/operationcondition.h b/operationcondition.h
index c3da827..2c4c4e7 100644
--- a/operationcondition.h
+++ b/operationcondition.h
@@ -24,17 +24,20 @@
#include <Qt>
#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;
@@ -44,9 +47,12 @@ public:
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