diff options
| -rw-r--r-- | node/ifnode.cpp | 2 | ||||
| -rw-r--r-- | node/listsetrollnode.cpp | 4 | ||||
| -rw-r--r-- | operationcondition.cpp | 2 | ||||
| -rw-r--r-- | parsingtoolbox.cpp | 13 | ||||
| -rw-r--r-- | parsingtoolbox.h | 2 |
5 files changed, 19 insertions, 4 deletions
diff --git a/node/ifnode.cpp b/node/ifnode.cpp index b1ca1da..27b588f 100644 --- a/node/ifnode.cpp +++ b/node/ifnode.cpp @@ -137,7 +137,7 @@ void IfNode::run(ExecutionNode *previous) { Die* dice = new Die(); dice->setValue(value); - dice->setFaces(value); + dice->setMaxValue(value); if(m_validator->hasValid(dice,true,true)) { nextNode=m_true; diff --git a/node/listsetrollnode.cpp b/node/listsetrollnode.cpp index fa66710..488721a 100644 --- a/node/listsetrollnode.cpp +++ b/node/listsetrollnode.cpp @@ -99,7 +99,7 @@ void ListSetRollNode::computeFacesNumber(Die* die) { if(m_rangeList.isEmpty()) { - die->setFaces(m_values.size()); + die->setMaxValue(m_values.size()); } else { @@ -116,7 +116,7 @@ void ListSetRollNode::computeFacesNumber(Die* die) ++i; } //qDebug() << "set Faces"<<max; - die->setFaces(max); + die->setMaxValue(max); } } diff --git a/operationcondition.cpp b/operationcondition.cpp index 262ab97..6664c83 100644 --- a/operationcondition.cpp +++ b/operationcondition.cpp @@ -57,7 +57,7 @@ qint64 OperationCondition::hasValid(Die* b,bool recursive,bool unhighlight) cons case Modulo: { Die die; - die.setFaces(b->getFaces()); + die.setMaxValue(b->getMaxValue()); die.insertRollValue(value%m_value); sum+=m_boolean->hasValid(&die,recursive,false); } diff --git a/parsingtoolbox.cpp b/parsingtoolbox.cpp index a5051fc..3d2d2c3 100644 --- a/parsingtoolbox.cpp +++ b/parsingtoolbox.cpp @@ -658,3 +658,16 @@ void ParsingToolBox::readProbability(QStringList& str,QList<Range>& ranges) } } +bool ParsingToolBox::readComment(QString& str, QString & result, QString& comment) +{ + QString left = str; + str = str.trimmed(); + if(str.startsWith("#")) + { + comment = left; + str = str.remove(0,1); + result = str.trimmed(); + return true; + } + return false; +} diff --git a/parsingtoolbox.h b/parsingtoolbox.h index 5d198be..75c01c2 100644 --- a/parsingtoolbox.h +++ b/parsingtoolbox.h @@ -178,6 +178,8 @@ public: * @return */ static IfNode::ConditionType readConditionType(QString &str); + + bool readComment(QString& str, QString &,QString &); private: QMap<QString,BooleanCondition::LogicOperator>* m_logicOp; |