diff options
| author |   Renaud Guezennec <renaud.guezennec@ext.mpsa.com> | 2016-02-04 17:58:00 +0100 |
|---|---|---|
| committer | Renaud Guezennec <renaud.guezennec@ext.mpsa.com> | 2016-02-04 17:58:00 +0100 |
| commit | c671d21b54d43dbd6112f3ab50fc6ebd63dc4aef (patch) | |
| tree | 34ad9a7a84e0e71cb45f8b381eccae431ca39d25 /diceparser.h | |
| parent | c796cef9dbbf48dcaf21dc4f4ea62db2ba4fe629 (diff) | |
| download | OneRoll-c671d21b54d43dbd6112f3ab50fc6ebd63dc4aef.tar.gz OneRoll-c671d21b54d43dbd6112f3ab50fc6ebd63dc4aef.zip | |
Add Management of Color
Diffstat (limited to 'diceparser.h')
| -rw-r--r-- | diceparser.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/diceparser.h b/diceparser.h index e1a5ee5..15a8a84 100644 --- a/diceparser.h +++ b/diceparser.h @@ -33,10 +33,9 @@ #include "booleancondition.h" #include "parsingtoolbox.h" #include "dicealias.h" +#include "highlightdice.h" - -typedef QPair<QList<quint64>,bool> DiceAndHighlight; -typedef QList<DiceAndHighlight > ListDiceResult; +typedef QList<HighLightDice > ListDiceResult; typedef QMap<int,ListDiceResult > ExportedDiceResult; class ExploseDiceNode; @@ -77,7 +76,7 @@ public: /** * @brief The OptionOperator enum gathering all options availables for result. */ - enum OptionOperator {KeepAndExplose,Keep,Reroll,Explosing,Sort,Count,RerollAndAdd,Merge,ifOperator}; + enum OptionOperator {KeepAndExplose,Keep,Reroll,Explosing,Sort,Count,RerollAndAdd,Merge,ifOperator,Painter}; /** * @brief The CommandOperator enum */ |