From c8130a4789d80fef5e4e070f3588f901c0e59fac Mon Sep 17 00:00:00 2001 From: obiwankennedy Date: Thu, 16 Jan 2014 11:20:36 +0100 Subject: Update range.cpp hasValid API --- range.cpp | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/range.cpp b/range.cpp index df70ef7..81a5ad9 100644 --- a/range.cpp +++ b/range.cpp @@ -11,11 +11,23 @@ void Range::setValue(qint64 s,qint64 e) m_end=e; } -bool Range::isValid(Die* m) const +qint64 Range::hasValid(Die* m,bool recursive) const { - if((m->getLastRolledValue()>=m_start)&&(m->getLastRolledValue()<=m_end)) + if(recursive) { - return true; + qint64 i = 0; + foreach(qint64 value, m->getListValue()) + { + if((value>=m_start)&&(value<=m_end)) + { + ++i; + } + } + return i; } - return false; + else if((m->getLastRolledValue()>=m_start)&&(m->getLastRolledValue()<=m_end)) + { + return 1; + } + return 0; } -- cgit v1.2.3-70-g09d2