Cleanup in content_mapblock (#5746)

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

diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp
index e0ee00ad62a8af0d23711817537d925799403fdb..2d1bd6d44acbdd4bca6cb9671dd518d099f7d441 100644 (file)
--- a/src/guiEngine.cpp
+++ b/src/guiEngine.cpp
@@ -60,7 +60,7 @@ void TextDestGuiEngine::gotText(const StringMap &fields)
 }
 
 /******************************************************************************/
-void TextDestGuiEngine::gotText(std::wstring text)
+void TextDestGuiEngine::gotText(const std::wstring &text)
 {
        m_engine->getScriptIface()->handleMainMenuEvent(wide_to_utf8(text));
 }
@@ -262,8 +262,24 @@ void GUIEngine::run()
 
        unsigned int text_height = g_fontengine->getTextHeight();
 
-       while(m_device->run() && (!m_startgame) && (!m_kill))
-       {
+       irr::core::dimension2d<u32> previous_screen_size(g_settings->getU16("screenW"),
+               g_settings->getU16("screenH"));
+
+       while (m_device->run() && (!m_startgame) && (!m_kill)) {
+
+               const irr::core::dimension2d<u32> &current_screen_size =
+                       m_device->getVideoDriver()->getScreenSize();
+               // Verify if window size has changed and save it if it's the case
+               // Ensure evaluating settings->getBool after verifying screensize
+               // First condition is cheaper
+               if (previous_screen_size != current_screen_size &&
+                               current_screen_size != irr::core::dimension2d<u32>(0,0) &&
+                               g_settings->getBool("autosave_screensize")) {
+                       g_settings->setU16("screenW", current_screen_size.Width);
+                       g_settings->setU16("screenH", current_screen_size.Height);
+                       previous_screen_size = current_screen_size;
+               }
+
                //check if we need to update the "upper left corner"-text
                if (text_height != g_fontengine->getTextHeight()) {
                        updateTopLeftTextSize();
@@ -540,7 +556,7 @@ bool GUIEngine::setTexture(texture_layer layer, std::string texturepath,
 }
 
 /******************************************************************************/
-bool GUIEngine::downloadFile(std::string url, std::string target)
+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);