Fix coloured fog in main menu (#8181)

[minetest.git] / src / gui / guiEngine.cpp

diff --git a/src/gui/guiEngine.cpp b/src/gui/guiEngine.cpp
index 00c3f85bcfa62eb09043440e810a60c958a19209..6030a5bfb5d3be0953691089b2693e6d273b26dd 100644 (file)
--- a/src/gui/guiEngine.cpp
+++ b/src/gui/guiEngine.cpp
@@ -31,12 +31,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "settings.h"
 #include "guiMainMenu.h"
 #include "sound.h"
-#include "sound_openal.h"
-#include "clouds.h"
+#include "client/sound_openal.h"
+#include "client/clouds.h"
 #include "httpfetch.h"
 #include "log.h"
-#include "fontengine.h"
-#include "guiscalingfilter.h"
+#include "client/fontengine.h"
+#include "client/guiscalingfilter.h"
 #include "irrlicht_changes/static_text.h"
 
 #ifdef __ANDROID__
@@ -70,22 +70,30 @@ MenuTextureSource::~MenuTextureSource()
 /******************************************************************************/
 video::ITexture *MenuTextureSource::getTexture(const std::string &name, u32 *id)
 {
-       if(id)
+       if (id)
                *id = 0;
-       if(name.empty())
+
+       if (name.empty())
                return NULL;
+
        m_to_delete.insert(name);
 
 #ifdef __ANDROID__
-       video::IImage *image = m_driver->createImageFromFile(name.c_str());
-       if (image) {
-               image = Align2Npot2(image, m_driver);
-               video::ITexture* retval = m_driver->addTexture(name.c_str(), image);
-               image->drop();
+       video::ITexture *retval = m_driver->findTexture(name.c_str());
+       if (retval)
                return retval;
-       }
-#endif
+
+       video::IImage *image = m_driver->createImageFromFile(name.c_str());
+       if (!image)
+               return NULL;
+
+       image = Align2Npot2(image, m_driver);
+       retval = m_driver->addTexture(name.c_str(), image);
+       image->drop();
+       return retval;
+#else
        return m_driver->getTexture(name.c_str());
+#endif
 }
 
 /******************************************************************************/
@@ -137,7 +145,8 @@ GUIEngine::GUIEngine(JoystickController *joystick,
        //create soundmanager
        MenuMusicFetcher soundfetcher;
 #if USE_SOUND
-       m_sound_manager = createOpenALSoundManager(g_sound_manager_singleton.get(), &soundfetcher);
+       if (g_settings->getBool("enable_sound"))
+               m_sound_manager = createOpenALSoundManager(g_sound_manager_singleton.get(), &soundfetcher);
 #endif
        if(!m_sound_manager)
                m_sound_manager = &dummySoundManager;
@@ -164,6 +173,7 @@ GUIEngine::GUIEngine(JoystickController *joystick,
                        m_texture_source,
                        m_formspecgui,
                        m_buttonhandler,
+                       "",
                        false);
 
        m_menu->allowClose(false);
@@ -232,6 +242,24 @@ void GUIEngine::run()
        irr::core::dimension2d<u32> previous_screen_size(g_settings->getU16("screen_w"),
                g_settings->getU16("screen_h"));
 
+       static const video::SColor sky_color(255, 140, 186, 250);
+
+       // Reset fog color
+       {
+               video::SColor fog_color;
+               video::E_FOG_TYPE fog_type = video::EFT_FOG_LINEAR;
+               f32 fog_start = 0;
+               f32 fog_end = 0;
+               f32 fog_density = 0;
+               bool fog_pixelfog = false;
+               bool fog_rangefog = false;
+               driver->getFog(fog_color, fog_type, fog_start, fog_end, fog_density,
+                               fog_pixelfog, fog_rangefog);
+
+               driver->setFog(sky_color, fog_type, fog_start, fog_end, fog_density,
+                               fog_pixelfog, fog_rangefog);
+       }
+
        while (RenderingEngine::run() && (!m_startgame) && (!m_kill)) {
 
                const irr::core::dimension2d<u32> &current_screen_size =
@@ -253,7 +281,7 @@ void GUIEngine::run()
                        text_height = g_fontengine->getTextHeight();
                }
 
-               driver->beginScene(true, true, video::SColor(255,140,186,250));
+               driver->beginScene(true, true, sky_color);
 
                if (m_clouds_enabled)
                {
@@ -313,7 +341,7 @@ void GUIEngine::cloudInit()
 {
        m_cloud.clouds = new Clouds(m_smgr, -1, rand());
        m_cloud.clouds->setHeight(100.0f);
-       m_cloud.clouds->update(v3f(0, 0, 0), video::SColor(255,200,200,255));
+       m_cloud.clouds->update(v3f(0, 0, 0), video::SColor(255,240,240,255));
 
        m_cloud.camera = m_smgr->addCameraSceneNode(0,
                                v3f(0,0,0), v3f(0, 60, 100));
@@ -520,7 +548,6 @@ bool GUIEngine::downloadFile(const std::string &url, const std::string &target)
 {
 #if USE_CURL
        std::ofstream target_file(target.c_str(), std::ios::out | std::ios::binary);
-
        if (!target_file.good()) {
                return false;
        }
@@ -533,6 +560,8 @@ bool GUIEngine::downloadFile(const std::string &url, const std::string &target)
        httpfetch_sync(fetch_request, fetch_result);
 
        if (!fetch_result.succeeded) {
+               target_file.close();
+               fs::DeleteSingleFileOrEmptyDirectory(target);
                return false;
        }
        target_file << fetch_result.data;