fix issue about mergin reroll until and make the help command a bit more complete

1 files changed, 5 insertions, 0 deletions

diff --git a/diceparser.cpp b/diceparser.cpp
index 641cf21..c160df4 100644
--- a/diceparser.cpp
+++ b/diceparser.cpp
@@ -1065,6 +1065,11 @@ bool DiceParser::readOption(QString& str,ExecutionNode* previous)//,
                     auto reroll = (operatorName==RerollAndAdd || operatorName==Reroll);
                     auto addingMode = (operatorName==RerollAndAdd);
                     RerollDiceNode* rerollNode = new RerollDiceNode(reroll, addingMode);
+                    ExecutionNode* nodeParam = nullptr;
+                    if(readParameterNode(str,nodeParam))
+                    {
+                        rerollNode->setInstruction(nodeParam);
+                    }
                     rerollNode->setValidator(validator);
                     previous->setNextNode(rerollNode);
                     node = rerollNode;