From 5938230cc183b562ab076dd46dabcaf325a21157 Mon Sep 17 00:00:00 2001 From: Renaud G Date: Wed, 22 Apr 2015 10:57:20 +0200 Subject: add bool value to know if the validator should remove the highlight of some dice --- range.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'range.cpp') diff --git a/range.cpp b/range.cpp index 1f47c50..909c96c 100644 --- a/range.cpp +++ b/range.cpp @@ -32,25 +32,28 @@ void Range::setValue(qint64 s,qint64 e) m_end=e; } -qint64 Range::hasValid(Die* m,bool recursive) const +qint64 Range::hasValid(Die* m,bool recursive, bool unhighlight) const { + qint64 result = 0; if(recursive) { - qint64 i = 0; foreach(qint64 value, m->getListValue()) { if((value>=m_start)&&(value<=m_end)) { - ++i; + ++result; } } - return i; } else if((m->getLastRolledValue()>=m_start)&&(m->getLastRolledValue()<=m_end)) { - return 1; + ++result; } - return 0; + if((unhighlight)&&(result==0)) + { + m->setHighlighted(false); + } + return result; } QString Range::toString() { -- cgit v1.2.3-70-g09d2