aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorRenaud G <renaud@rolisteam.org>2019-03-23 17:54:41 +0100
committerRenaud G <renaud@rolisteam.org>2019-03-23 17:58:32 +0100
commit73f1a28bf31bebe02310865e31cac2cf3f2f6b55 (patch)
tree987dd1c181e17c312ec608b836e2b60a60485636
parente0e58bffefefbb5440463bc598af942c0daca91f (diff)
downloadOneRoll-73f1a28bf31bebe02310865e31cac2cf3f2f6b55.tar.gz
OneRoll-73f1a28bf31bebe02310865e31cac2cf3f2f6b55.zip
Use occurence node.
-rw-r--r--diceparser.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/diceparser.cpp b/diceparser.cpp
index 9f018b4..8efa83e 100644
--- a/diceparser.cpp
+++ b/diceparser.cpp
@@ -1122,22 +1122,22 @@ bool DiceParser::readOption(QString& str, ExecutionNode* previous) //,
if(m_parsingToolbox->readNumber(str, number))
{
occNode->setWidth(number);
- /*Validator* validator= m_parsingToolbox->readCompositeValidator(str);
+ Validator* validator= m_parsingToolbox->readCompositeValidator(str);
if(validator)
{
occNode->setValidator(validator);
- }*/
- if(m_parsingToolbox->readComma(str))
+ }
+ else if(m_parsingToolbox->readComma(str))
{
if(m_parsingToolbox->readNumber(str, number))
{
occNode->setHeight(number);
- previous->setNextNode(occNode);
- node= occNode;
- found= true;
}
}
}
+ previous->setNextNode(occNode);
+ node= occNode;
+ found= true;
}
break;
case Painter: