diff options
| author |   Renaud G <renaud@rolisteam.org> | 2016-01-17 01:57:39 +0100 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2016-01-17 01:57:39 +0100 |
| commit | c9df65aae8ca3234b5ec4abe08e687e1d2cd07bc (patch) | |
| tree | 65605d2b5930d80c24d6aa9807c39e46a789c340 /diceparser.h | |
| parent | 239051eff0ca6f28a4143c0f680c2600b2b0cb64 (diff) | |
| parent | 7df15a3d41d87bbed9155a5cff2fda70acbf2f0e (diff) | |
| download | OneRoll-c9df65aae8ca3234b5ec4abe08e687e1d2cd07bc.tar.gz OneRoll-c9df65aae8ca3234b5ec4abe08e687e1d2cd07bc.zip | |
Merge branch 'master' of github.com:Rolisteam/DiceParser
Diffstat (limited to 'diceparser.h')
| -rw-r--r-- | diceparser.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/diceparser.h b/diceparser.h index 9ef2327..bc92034 100644 --- a/diceparser.h +++ b/diceparser.h @@ -77,7 +77,7 @@ public: /** * @brief The OptionOperator enum gathering all options availables for result. */ - enum OptionOperator {KeepAndExplose,Keep,Reroll,Explosing,Sort,Count,RerollAndAdd}; + enum OptionOperator {KeepAndExplose,Keep,Reroll,Explosing,Sort,Count,RerollAndAdd,Merge}; /** * @brief The CommandOperator enum */ @@ -135,7 +135,7 @@ public: * @brief getLastDiceResult * @return */ - void getLastDiceResult(ExportedDiceResult& diceValues); + void getLastDiceResult(ExportedDiceResult& diceValues,bool& homogeneous); /** * @brief hasIntegerResultNotInFirst * @return |