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

fixed last check in. Test suite passes. Added comments on possible null pointer exceptions.

Browse Source 
Updated XCode project file to include AIPlayerBaka classes.
Added test suite to iOS build
This commit is contained in:
techdragon.nguyen@gmail.com
2011-10-09 05:51:45 +00:00
parent 2bfe76e124
commit 6f10ef8425
16 changed files with 75 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
projects/mtg/src/WGui.cpp
View File

@@ -899,13 +899,12 @@ bool WGuiSplit::yieldFocus()
}
//WGuiMenu
WGuiMenu::WGuiMenu(JButton next = JGE_BTN_RIGHT, JButton prev = JGE_BTN_LEFT, bool m, WSyncable * syncme) :
WGuiItem("")
WGuiMenu::WGuiMenu(JButton next, JButton prev, bool dPad, WSyncable * syncme) : WGuiItem("")
{
buttonNext = next;
buttonPrev = prev;
currentItem = -1;
mDPad = m;
mDPad = dPad;
sync = syncme;
held = JGE_BTN_NONE;
}
@@ -1100,7 +1099,6 @@ bool WGuiMenu::nextItem()
while (potential < nbitems - 1 && items[potential]->Selectable() == false)
potential++;
if (potential != currentItem && (!now || now->Leaving(buttonNext)))
{
currentItem = potential;
@@ -1130,9 +1128,9 @@ bool WGuiMenu::prevItem()
while (potential > 0 && items[potential]->Selectable() == false)
potential--;
if (potential < 0 || !items[potential]->Selectable())
potential = -1;
else if (potential != currentItem && (!now || now->Leaving(buttonNext)))
if ( (!(potential < 0 || !items[potential]->Selectable()))
&& (potential != currentItem && (!now || now->Leaving(buttonNext))))
{
currentItem = potential;
items[currentItem]->Entering(buttonPrev);