Skip to content
Permalink
Browse files

- removed useless conditions from options menu

  • Loading branch information...
alexey-lysiuk committed Sep 8, 2019
1 parent 526a576 commit 31ebeaf833f523c224837f65acedfd96a9a39ab7
Showing with 8 additions and 11 deletions.
  1. +8 −11 wadsrc/static/zscript/ui/menu/optionmenu.zs
@@ -123,7 +123,7 @@ class OptionMenu : Menu
}
}

if (mDesc != NULL && mDesc.mSelectedItem == -1) mDesc.mSelectedItem = FirstSelectable();
if (mDesc.mSelectedItem == -1) mDesc.mSelectedItem = FirstSelectable();
mDesc.CalcIndent();

// notify all items that the menu was just created.
@@ -159,18 +159,15 @@ class OptionMenu : Menu

int FirstSelectable()
{
if (mDesc != NULL)
// Go down to the first selectable item
int i = -1;
do
{
// Go down to the first selectable item
int i = -1;
do
{
i++;
}
while (i < mDesc.mItems.Size() && !mDesc.mItems[i].Selectable());
if (i>=0 && i < mDesc.mItems.Size()) return i;
i++;
}
return -1;
while (i < mDesc.mItems.Size() && !mDesc.mItems[i].Selectable());
if (i>=0 && i < mDesc.mItems.Size()) return i;
else return -1;
}

//=============================================================================

0 comments on commit 31ebeaf

Please sign in to comment.
You can’t perform that action at this time.