diff options
| author |   Renaud G <renaud@rolisteam.org> | 2015-05-17 00:05:06 +0200 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2015-05-17 00:05:06 +0200 |
| commit | c8c9bffb2b439b95d5061d639ebecec07271ae01 (patch) | |
| tree | d9d77f9a2b0bb5cee7e9b4d4f2c500d7a33bdc52 /diceparser.cpp | |
| parent | bb89b91d9919ad9fed8b9d30ea0df79ceea4d3f7 (diff) | |
| parent | 2f24c7b8361d87b67e0a204b1f054d750f650d66 (diff) | |
| download | OneRoll-c8c9bffb2b439b95d5061d639ebecec07271ae01.tar.gz OneRoll-c8c9bffb2b439b95d5061d639ebecec07271ae01.zip | |
Merge branch 'master' of github.com:obiwankennedy/DiceParser
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 f6cb59a..f8f82d6 100644 --- a/diceparser.cpp +++ b/diceparser.cpp @@ -542,7 +542,6 @@ bool DiceParser::readDice(QString& str,ExecutionNode* & node) { int face = abs(num - end)+1; - qDebug()<< num << end<< face; DiceRollerNode* drNode = new DiceRollerNode(face,num); node = drNode; ExecutionNode* current = drNode; @@ -774,8 +773,11 @@ bool DiceParser::readOption(QString& str,ExecutionNode* previous, bool hasDice)/ previous = addRollDiceNode(DEFAULT_FACES_NUMBER,previous); } DiceRollerNode* nodeTmp = dynamic_cast<DiceRollerNode*>(previous); + if(NULL!=nodeTmp) + { - previous = addExploseDiceNode(nodeTmp->getFaces(),previous); + previous = addExploseDiceNode(nodeTmp->getFaces(),previous); + } node = m_parsingToolbox->addSort(previous,ascending); |