diff options
| author | sapier <Sapier at GMX dot net> | 2014-07-16 14:04:50 +0200 |
|---|---|---|
| committer | sapier <Sapier at GMX dot net> | 2014-08-23 01:55:54 +0200 |
| commit | 996ea60642c5d78fc915573af0641d78bc7e2d49 (patch) | |
| tree | 9af38da13cd94dbfff1f683e4a4314c0b74ac76f /src/main.cpp | |
| parent | 26f4a5c1109f99fed6d7941b870a94fa49642181 (diff) | |
| download | minetest-996ea60642c5d78fc915573af0641d78bc7e2d49.tar.gz minetest-996ea60642c5d78fc915573af0641d78bc7e2d49.tar.bz2 minetest-996ea60642c5d78fc915573af0641d78bc7e2d49.zip | |
Add video driver selection to settings menu (based uppon idea from webdesigner97)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 54 |
1 files changed, 28 insertions, 26 deletions
diff --git a/src/main.cpp b/src/main.cpp index 1b91edd21..9d336825e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1365,41 +1365,43 @@ int main(int argc, char *argv[]) u16 fsaa = g_settings->getU16("fsaa"); // Determine driver - - video::E_DRIVER_TYPE driverType; - - std::string driverstring = g_settings->get("video_driver"); - - if (driverstring == "null") - driverType = video::EDT_NULL; - else if (driverstring == "software") - driverType = video::EDT_SOFTWARE; - else if (driverstring == "burningsvideo") - driverType = video::EDT_BURNINGSVIDEO; - else if (driverstring == "direct3d8") - driverType = video::EDT_DIRECT3D8; - else if (driverstring == "direct3d9") - driverType = video::EDT_DIRECT3D9; - else if (driverstring == "opengl") - driverType = video::EDT_OPENGL; + video::E_DRIVER_TYPE driverType = video::EDT_OPENGL; + static const char* driverids[] = { + "null", + "software", + "burningsvideo", + "direct3d8", + "direct3d9", + "opengl" #ifdef _IRR_COMPILE_WITH_OGLES1_ - else if (driverstring == "ogles1") - driverType = video::EDT_OGLES1; + ,"ogles1" #endif #ifdef _IRR_COMPILE_WITH_OGLES2_ - else if (driverstring == "ogles2") - driverType = video::EDT_OGLES2; + ,"ogles2" #endif - else { - errorstream << "WARNING: Invalid video_driver specified; defaulting " - << "to opengl" << std::endl; - driverType = video::EDT_OPENGL; + ,"invalid" + }; + + std::string driverstring = g_settings->get("video_driver"); + for (unsigned int i = 0; + i < (sizeof(driverids)/sizeof(driverids[0])); + i++) + { + if (strcasecmp(driverstring.c_str(), driverids[i]) == 0) { + driverType = (video::E_DRIVER_TYPE) i; + break; + } + + if (strcasecmp("invalid", driverids[i]) == 0) { + errorstream << "WARNING: Invalid video_driver specified; defaulting " + << "to opengl" << std::endl; + break; + } } /* List video modes if requested */ - MyEventReceiver* receiver = new MyEventReceiver(); if (cmd_args.getFlag("videomodes")) { |