diff options
| author | 2018-01-25 01:06:07 +0100 | |
|---|---|---|
| committer | 2018-01-25 01:06:07 +0100 | |
| commit | bb9eeae7d5798d5c2c8579949c544b55be1bcbca (patch) | |
| tree | 768c7da75e6611fd0bc128b659255dcfc7cd1f84 /diceparser.cpp | |
| parent | 8904bc61ad71f407fbefa4b80793ba424f2ce88b (diff) | |
| download | OneRoll-bb9eeae7d5798d5c2c8579949c544b55be1bcbca.tar.gz OneRoll-bb9eeae7d5798d5c2c8579949c544b55be1bcbca.zip | |
-Add management of unique for dice and list.
Diffstat (limited to 'diceparser.cpp')
| -rw-r--r-- | diceparser.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/diceparser.cpp b/diceparser.cpp index b4dba75..24bf3c4 100644 --- a/diceparser.cpp +++ b/diceparser.cpp @@ -650,6 +650,8 @@ bool DiceParser::readDice(QString& str,ExecutionNode* & node) { qint64 max; qint64 min; + bool unique = (ParsingToolBox::UNIQUE == m_parsingToolbox->readListOperator(str)) ? + true : false; Die::ArithmeticOperator op; bool hasOp= m_parsingToolbox->readArithmeticOperator(str,op); @@ -661,6 +663,7 @@ bool DiceParser::readDice(QString& str,ExecutionNode* & node) return false; } DiceRollerNode* drNode = new DiceRollerNode(max); + drNode->setUnique(unique); if(hasOp) { drNode->setOperator(op); @@ -675,11 +678,10 @@ bool DiceParser::readDice(QString& str,ExecutionNode* & node) } else if(m_parsingToolbox->readDiceRange(str,min,max)) { - // qint64 face = abs(num - end); //qDebug() << face << end; DiceRollerNode* drNode = new DiceRollerNode(max,min); - + drNode->setUnique(unique); if(hasOp) { drNode->setOperator(op); |