diff options
| author | cutealien <cutealien@dfc29bdd-3216-0410-991c-e03cc46cb475> | 2020-12-19 15:03:11 +0000 |
|---|---|---|
| committer | cutealien <cutealien@dfc29bdd-3216-0410-991c-e03cc46cb475> | 2020-12-19 15:03:11 +0000 |
| commit | fa0b1cb5092bb1c2109ff870587a32b771179705 (patch) | |
| tree | 5f5f85e537b2d5d92ff2a2b2e621549a2cc9c062 /examples/Demo/CMainMenu.cpp | |
| parent | 01920bf808be378363ebcdc81e78b251d9189f60 (diff) | |
| download | irrlicht-fa0b1cb5092bb1c2109ff870587a32b771179705.tar.xz | |
Merging r6145 through r6171 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6172 dfc29bdd-3216-0410-991c-e03cc46cb475
Diffstat (limited to 'examples/Demo/CMainMenu.cpp')
| -rw-r--r-- | examples/Demo/CMainMenu.cpp | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/examples/Demo/CMainMenu.cpp b/examples/Demo/CMainMenu.cpp index 432c872..f67d9f3 100644 --- a/examples/Demo/CMainMenu.cpp +++ b/examples/Demo/CMainMenu.cpp @@ -72,24 +72,14 @@ bool CMainMenu::run() // add list box
gui::IGUIListBox* box = guienv->addListBox(core::rect<int>(10,10,220,120), optTab, 1);
-
- const wchar_t* const names[] =
- {L"Software Renderer", L"Burning's Video",
- L"Direct3D 8", L"Direct3D 9", L"OpenGL 1.x-4.x",
- L"OpenGL-ES 1.x", L"OpenGL-ES 2.x"};
for (u32 i=1; i<video::EDT_COUNT; ++i)
{
if (IrrlichtDevice::isDriverSupported(video::E_DRIVER_TYPE(i)))
- box->addItem(names[i-1]);
- }
-
- switch (driverType )
- {
- case video::EDT_OPENGL: selected = 0; break;
- case video::EDT_DIRECT3D9: selected = 1; break;
- case video::EDT_BURNINGSVIDEO: selected = 2; break;
- case video::EDT_SOFTWARE: selected = 3; break;
- default: break;
+ {
+ box->addItem(core::stringw(video::DRIVER_TYPE_NAMES[i]).c_str());
+ if ( driverType == video::E_DRIVER_TYPE(i) )
+ selected = box->getItemCount()-1;
+ }
}
box->setSelected(selected);
|