diff options
| author |   Renaud G <renaud@rolisteam.org> | 2015-04-24 21:35:17 +0200 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2015-04-24 21:35:17 +0200 |
| commit | 8beb664172cf2c15abb4e12938b8978506471c02 (patch) | |
| tree | f033c9df5436abe8848a8b4d69353229028c02bd /booleancondition.h | |
| parent | 67fd3b480f543f2f18bd632ea85d829ba2102a20 (diff) | |
| parent | edfcca8d1a630ca7ca79133bd0b03af14fef6363 (diff) | |
| download | OneRoll-8beb664172cf2c15abb4e12938b8978506471c02.tar.gz OneRoll-8beb664172cf2c15abb4e12938b8978506471c02.zip | |
Merge branch 'master' of github.com:obiwankennedy/DiceParser
Conflicts:
parsingtoolbox.cpp
Diffstat (limited to 'booleancondition.h')
| -rw-r--r-- | booleancondition.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/booleancondition.h b/booleancondition.h index 02fadf9..8de8854 100644 --- a/booleancondition.h +++ b/booleancondition.h @@ -31,7 +31,7 @@ public: enum LogicOperator { Equal, GreaterThan, LesserThan, GreaterOrEqual, LesserOrEqual}; BooleanCondition(); - virtual qint64 hasValid(Die* b,bool recursive) const; + virtual qint64 hasValid(Die* b,bool recursive, bool unhighlight = false) const; void setOperator(LogicOperator m); void setValue(qint64); |