aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/diceparser.h
diff options
context:
space:
mode:
authorRenaud G <renaud@rolisteam.org>2015-12-24 11:21:35 +0100
committerRenaud G <renaud@rolisteam.org>2015-12-24 11:21:35 +0100
commit8572e4c63bf4c3b1decfb95e09960f899f198dd2 (patch)
tree884315ae7abf80ee247335df2eb3ee52c7e76e06 /diceparser.h
parent0332e66a2ff0fed8a307d2ec1deddaf4dc00c75e (diff)
downloadOneRoll-8572e4c63bf4c3b1decfb95e09960f899f198dd2.tar.gz
OneRoll-8572e4c63bf4c3b1decfb95e09960f899f198dd2.zip
-Add MergeOp and homogeneous status for result.
Diffstat (limited to 'diceparser.h')
-rw-r--r--diceparser.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/diceparser.h b/diceparser.h
index 6b9056f..045ec12 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