aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/parsingtoolbox.cpp
diff options
context:
space:
mode:
authorRenaud G <renaud@rolisteam.org>2019-07-28 01:35:59 +0200
committerRenaud G <renaud@rolisteam.org>2019-07-28 01:35:59 +0200
commit7f535260bbc2210bf8d605bac88546e9f18b2b05 (patch)
treee519a681900aa5041d6bdb11004c14282f4c0b98 /parsingtoolbox.cpp
parentf1a89a3ca758c8af549e62ad4258504cb2bc2c7c (diff)
downloadOneRoll-7f535260bbc2210bf8d605bac88546e9f18b2b05.tar.gz
OneRoll-7f535260bbc2210bf8d605bac88546e9f18b2b05.zip
New API for isValidRangeSize
Diffstat (limited to 'parsingtoolbox.cpp')
-rw-r--r--parsingtoolbox.cpp16
1 files changed, 5 insertions, 11 deletions
diff --git a/parsingtoolbox.cpp b/parsingtoolbox.cpp
index 2453eb7..4084825 100644
--- a/parsingtoolbox.cpp
+++ b/parsingtoolbox.cpp
@@ -601,19 +601,13 @@ bool ParsingToolBox::readAscending(QString& str)
}
return false;
}
-bool ParsingToolBox::isValidValidator(ExecutionNode* previous, Validator* val)
+Dice::CONDITION_STATE ParsingToolBox::isValidValidator(ExecutionNode* previous, Validator* val)
{
DiceRollerNode* node= getDiceRollerNode(previous);
- bool valid= false;
- if(nullptr != node)
- {
- valid= val->isValidRangeSize(node->getRange());
- }
- else
- {
- valid= true;
- }
- return valid;
+ if(nullptr == node)
+ return Dice::CONDITION_STATE::ERROR;
+
+ return val->isValidRangeSize(node->getRange());
}
DiceRollerNode* ParsingToolBox::getDiceRollerNode(ExecutionNode* previous)
{