ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable features of irrlicht's contextual menu that we don't need and cause floods of warnings

Browse Source
This commit is contained in:
Marianne Gagnon 2014-09-30 19:33:25 -04:00
parent 2236e8dd1c
commit 7387a51381
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/irrlicht/source/Irrlicht/CGUIContextMenu.cpp
View File

@ -584,30 +584,30 @@ void CGUIContextMenu::draw()
skin->getColor(c), false, true, clip); skin->getColor(c), false, true, clip);
// draw submenu symbol // draw submenu symbol
if (Items[i].SubMenu && sprites) //if (Items[i].SubMenu && sprites)
{ //{
core::rect<s32> r = rect; // core::rect<s32> r = rect;
r.UpperLeftCorner.X = r.LowerRightCorner.X - 15; // r.UpperLeftCorner.X = r.LowerRightCorner.X - 15;
//
sprites->draw2DSprite(skin->getIcon(EGDI_CURSOR_RIGHT), // sprites->draw2DSprite(skin->getIcon(EGDI_CURSOR_RIGHT),
r.getCenter(), clip, skin->getColor(c), // r.getCenter(), clip, skin->getColor(c),
(i == HighLighted) ? ChangeTime : 0, // (i == HighLighted) ? ChangeTime : 0,
(i == HighLighted) ? os::Timer::getTime() : 0, // (i == HighLighted) ? os::Timer::getTime() : 0,
(i == HighLighted), true); // (i == HighLighted), true);
} //}
// draw checked symbol // draw checked symbol
if (Items[i].Checked && sprites) //if (Items[i].Checked && sprites)
{ //{
core::rect<s32> r = rect; // core::rect<s32> r = rect;
r.LowerRightCorner.X = r.UpperLeftCorner.X - 15; // r.LowerRightCorner.X = r.UpperLeftCorner.X - 15;
r.UpperLeftCorner.X = r.LowerRightCorner.X + 15; // r.UpperLeftCorner.X = r.LowerRightCorner.X + 15;
sprites->draw2DSprite(skin->getIcon(EGDI_CHECK_BOX_CHECKED), // sprites->draw2DSprite(skin->getIcon(EGDI_CHECK_BOX_CHECKED),
r.getCenter(), clip, skin->getColor(c), // r.getCenter(), clip, skin->getColor(c),
(i == HighLighted) ? ChangeTime : 0, // (i == HighLighted) ? ChangeTime : 0,
(i == HighLighted) ? os::Timer::getTime() : 0, // (i == HighLighted) ? os::Timer::getTime() : 0,
(i == HighLighted), true); // (i == HighLighted), true);
} //}
} }
} }