aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/diceparser.h
diff options
context:
space:
mode:
authorobiwankennedy <renaud@rolisteam.org>2014-01-08 18:16:56 +0100
committerobiwankennedy <renaud@rolisteam.org>2014-01-08 18:16:56 +0100
commitce287c6b7104b11bb3b71cc5ddb79cf3d66c1ccb (patch)
tree5bb63ed6b88cb9ffc5ad067201e870859093f0fc /diceparser.h
parenta9873a1e4d2f785660b288921ec673ccb9fe20c0 (diff)
downloadOneRoll-ce287c6b7104b11bb3b71cc5ddb79cf3d66c1ccb.tar.gz
OneRoll-ce287c6b7104b11bb3b71cc5ddb79cf3d66c1ccb.zip
Update diceparser.h
reroll wroking
Diffstat (limited to 'diceparser.h')
-rw-r--r--diceparser.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/diceparser.h b/diceparser.h
index 30f1362..434ae85 100644
--- a/diceparser.h
+++ b/diceparser.h
@@ -3,7 +3,10 @@
#include <QString>
#include <QMap>
+
#include "node/executionnode.h"
+#include "node/dicerollernode.h"
+
#include "validator.h"
#include "range.h"
#include "booleancondition.h"
@@ -40,7 +43,7 @@ public:
/**
* @brief The OptionOperator enum gathering all options availables for result.
*/
- enum OptionOperator {KeepAndReRoll,keep,Reroll,Explosing,Sort,Count};
+ enum OptionOperator {KeepAndExplose,keep,Reroll,Explosing,Sort,Count};
/**
* @brief DiceParser default constructor
@@ -92,7 +95,7 @@ private:
/**
* @brief readOption
*/
- bool readOption(QString&,ExecutionNode* node);
+ bool readOption(QString&,ExecutionNode* node, DiceRollerNode* diceNode);
/**
* @brief addSort