From 08b6975300f2c4da7c4711d61a03435648cb16c6 Mon Sep 17 00:00:00 2001 From: "techdragon.nguyen@gmail.com" Date: Sun, 25 Mar 2012 23:43:59 +0000 Subject: [PATCH] refactoring change for http://code.google.com/p/wagic/source/detail?r=4364 to ensure bounds for n is always met. --- projects/mtg/src/SimpleMenu.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/mtg/src/SimpleMenu.cpp b/projects/mtg/src/SimpleMenu.cpp index 9dddbdc45..a4eab56d9 100644 --- a/projects/mtg/src/SimpleMenu.cpp +++ b/projects/mtg/src/SimpleMenu.cpp @@ -247,14 +247,7 @@ bool SimpleMenu::CheckUserInput(JButton key) if (y < menuTopEdge) n = (mCurr - 1) > 0 ? mCurr -1 : 0; else if (y >= menuBottomEdge) - { - if(mCurr +1 < mCount) - n = mCurr + 1; - else if(mCurr - 1 > 0) - n = mCurr - 1; - else - n = 0; - } + n = (mCurr + 1) < mCount ? mCurr + 1 : mCurr - 1; else { for (int i = 0; i < mCount; i++) @@ -266,6 +259,13 @@ bool SimpleMenu::CheckUserInput(JButton key) } } } + + // check bounds of n. + if ( n < 0 ) + n = 0; + if ( n >= mCount ) + n = mCount - 1; + // check to see if the user clicked if (n != mCurr && mObjects[mCurr] != NULL && mObjects[mCurr]->Leaving(JGE_BTN_DOWN)) {