Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring change for http://code.google.com/p/wagic/source/detail?r=4364 to ensure bounds for n is always met.

Browse Source
This commit is contained in:
techdragon.nguyen@gmail.com
2012-03-25 23:43:59 +00:00
parent 5e34cf8bb2
commit 08b6975300
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
projects/mtg/src/SimpleMenu.cpp
View File

@@ -247,14 +247,7 @@ bool SimpleMenu::CheckUserInput(JButton key)
if (y < menuTopEdge) if (y < menuTopEdge)
n = (mCurr - 1) > 0 ? mCurr -1 : 0; n = (mCurr - 1) > 0 ? mCurr -1 : 0;
else if (y >= menuBottomEdge) else if (y >= menuBottomEdge)
{ n = (mCurr + 1) < mCount ? mCurr + 1 : mCurr - 1;
if(mCurr +1 < mCount)
n = mCurr + 1;
else if(mCurr - 1 > 0)
n = mCurr - 1;
else
n = 0;
}
else else
{ {
for (int i = 0; i < mCount; i++) 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 // check to see if the user clicked
if (n != mCurr && mObjects[mCurr] != NULL && mObjects[mCurr]->Leaving(JGE_BTN_DOWN)) if (n != mCurr && mObjects[mCurr] != NULL && mObjects[mCurr]->Leaving(JGE_BTN_DOWN))
{ {