Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / client / minimap.cpp

diff --git a/src/client/minimap.cpp b/src/client/minimap.cpp
index 97977c366bddb103ab43e5d683fc0bb2cd776dcb..9bb9d14e0ff5c2e513450aaa7451350dc642a835 100644 (file)
--- a/src/client/minimap.cpp
+++ b/src/client/minimap.cpp
@@ -304,7 +304,7 @@ void Minimap::setModeIndex(size_t index)
                data->mode = m_modes[index];
                m_current_mode_index = index;
        } else {
-               data->mode = MinimapModeDef{MINIMAP_TYPE_OFF, gettext("Minimap hidden"), 0, 0, ""};
+               data->mode = {MINIMAP_TYPE_OFF, gettext("Minimap hidden"), 0, 0, "", 0};
                m_current_mode_index = 0;
        }
 
@@ -577,12 +577,12 @@ scene::SMeshBuffer *Minimap::getMinimapMeshBuffer()
 void Minimap::drawMinimap()
 {
        // Non hud managed minimap drawing (legacy minimap)
-       v2u32 screensize = RenderingEngine::get_instance()->getWindowSize();
+       v2u32 screensize = RenderingEngine::getWindowSize();
        const u32 size = 0.25 * screensize.Y;
 
        drawMinimap(core::rect<s32>(
-               screensize.X - size - 10, 10,
-               screensize.X - 10, size + 10));
+               screensize.X - size * 2 - 10, 10,
+               screensize.X - size - 10, size + 10));
 }
 
 void Minimap::drawMinimap(core::rect<s32> rect) {