From 8572e4c63bf4c3b1decfb95e09960f899f198dd2 Mon Sep 17 00:00:00 2001
From: Renaud G <renaud@rolisteam.org>
Date: Thu, 24 Dec 2015 11:21:35 +0100
Subject: -Add MergeOp and homogeneous status for result.

---
 diceparser.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'diceparser.h')

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
-- 
cgit v1.2.3-70-g09d2