OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: GCC warnings.

Browse source 
SVN r2843 (trunk)
This commit is contained in:
Braden Obrzut 2010-09-21 20:35:40 +00:00
commit 15d74dab56
9 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/menu/optionmenu.cpp
View file

@ -392,13 +392,13 @@ void DOptionMenu::Drawer ()
for (i = 0; i < mDesc->mItems.Size() && y <= lastrow; i++, y += fontheight)
{
// Don't scroll the uppermost items
if (i == mDesc->mScrollTop)
if (i == static_cast<unsigned int> (mDesc->mScrollTop))
{
i += mDesc->mScrollPos;
if (i >= mDesc->mItems.Size()) break; // skipped beyond end of menu
}
int cur_indent = mDesc->mItems[i]->Draw(mDesc, y, indent, mDesc->mSelectedItem == i);
if (cur_indent >= 0 && mDesc->mSelectedItem == i && mDesc->mItems[i]->Selectable())
int cur_indent = mDesc->mItems[i]->Draw(mDesc, y, indent, static_cast<unsigned int> (mDesc->mSelectedItem) == i);
if (cur_indent >= 0 && static_cast<unsigned int> (mDesc->mSelectedItem) == i && mDesc->mItems[i]->Selectable())
{
if (((DMenu::MenuTime%8) < 6) || DMenu::CurrentMenu != this)
{