Mgv7 mountains: Remove divide by zero code that creates vast walls

[dragonfireclient.git] / src / porting.cpp

diff --git a/src/porting.cpp b/src/porting.cpp
index 885b36e21a341e478bbc0996f67afb210c99f1ff..8a685539b20d13cbaee599d3b01706a905ee3c85 100644 (file)
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -290,7 +290,11 @@ void pathRemoveFile(char *path, char delim)
 bool detectMSVCBuildDir(char *c_path)
 {
        std::string path(c_path);
-       const char *ends[] = {"bin\\Release", "bin\\Build", NULL};
+       const char *ends[] = {
+               "bin\\Release",
+               "bin\\Debug",
+               "bin\\Build",
+               NULL};
        return (removeStringEnd(path, ends) != "");
 }
 
@@ -549,16 +553,20 @@ void initializePaths()
 #endif // RUN_IN_PLACE
 }
 
-static irr::IrrlichtDevice* device;
+static irr::IrrlichtDevice *device;
 
-void initIrrlicht(irr::IrrlichtDevice * _device) {
-       device = _device;
+void initIrrlicht(irr::IrrlichtDevice *device_)
+{
+       device = device_;
 }
 
 void setXorgClassHint(const video::SExposedVideoData &video_data,
        const std::string &name)
 {
 #ifdef XORG_USED
+       if (video_data.OpenGLLinux.X11Display == NULL)
+               return;
+
        XClassHint *classhint = XAllocClassHint();
        classhint->res_name  = (char *)name.c_str();
        classhint->res_class = (char *)name.c_str();
@@ -575,9 +583,72 @@ v2u32 getWindowSize()
        return device->getVideoDriver()->getScreenSize();
 }
 
+
+std::vector<core::vector3d<u32> > getVideoModes()
+{
+       std::vector<core::vector3d<u32> > mlist;
+       video::IVideoModeList *modelist = device->getVideoModeList();
+
+       u32 num_modes = modelist->getVideoModeCount();
+       for (u32 i = 0; i != num_modes; i++) {
+               core::dimension2d<u32> mode_res = modelist->getVideoModeResolution(i);
+               s32 mode_depth = modelist->getVideoModeDepth(i);
+               mlist.push_back(core::vector3d<u32>(mode_res.Width, mode_res.Height, mode_depth));
+       }
+
+       return mlist;
+}
+
+std::vector<irr::video::E_DRIVER_TYPE> getSupportedVideoDrivers()
+{
+       std::vector<irr::video::E_DRIVER_TYPE> drivers;
+
+       for (int i = 0; i != irr::video::EDT_COUNT; i++) {
+               if (irr::IrrlichtDevice::isDriverSupported((irr::video::E_DRIVER_TYPE)i))
+                       drivers.push_back((irr::video::E_DRIVER_TYPE)i);
+       }
+
+       return drivers;
+}
+
+const char *getVideoDriverName(irr::video::E_DRIVER_TYPE type)
+{
+       static const char *driver_ids[] = {
+               "null",
+               "software",
+               "burningsvideo",
+               "direct3d8",
+               "direct3d9",
+               "opengl",
+               "ogles1",
+               "ogles2",
+       };
+
+       return driver_ids[type];
+}
+
+
+const char *getVideoDriverFriendlyName(irr::video::E_DRIVER_TYPE type)
+{
+       static const char *driver_names[] = {
+               "NULL Driver",
+               "Software Renderer",
+               "Burning's Video",
+               "Direct3D 8",
+               "Direct3D 9",
+               "OpenGL",
+               "OpenGL ES1",
+               "OpenGL ES2",
+       };
+
+       return driver_names[type];
+}
+
+
 #ifndef __ANDROID__
 #ifdef XORG_USED
-float getDisplayDensity()
+
+static float calcDisplayDensity()
 {
        const char* current_display = getenv("DISPLAY");
 
@@ -595,7 +666,7 @@ float getDisplayDensity()
 
                                XCloseDisplay(x11display);
 
-                               return (std::max(dpi_height,dpi_width) / 96.0);
+                               return std::max(dpi_height,dpi_width) / 96.0;
                        }
                }
 
@@ -603,6 +674,14 @@ float getDisplayDensity()
        return g_settings->getFloat("screen_dpi")/96.0;
 }
 
+
+float getDisplayDensity()
+{
+       static float cached_display_density = calcDisplayDensity();
+       return cached_display_density;
+}
+
+
 #else
 float getDisplayDensity()
 {