Cpp11 initializers: last src root changeset (#6022)

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

diff --git a/src/drawscene.cpp b/src/drawscene.cpp
index 7d2d1d12f24ad707d3e3d1a785b9c1c4588abbdd..2cf9689a8e5586b6fe8e3c2800365873169c9911 100644 (file)
--- a/src/drawscene.cpp
+++ b/src/drawscene.cpp
@@ -474,7 +474,7 @@ void draw_plain(Camera &camera, bool show_hud,
        // Undersampling-specific stuff
        static video::ITexture *image = NULL;
        static v2u32 last_pixelated_size = v2u32(0, 0);
-       int undersampling = g_settings->getU16("undersampling");
+       static thread_local int undersampling = g_settings->getU16("undersampling");
        v2u32 pixelated_size;
        v2u32 dest_size;
        if (undersampling > 0) {
@@ -509,7 +509,7 @@ void draw_plain(Camera &camera, bool show_hud,
 
 void draw_scene(video::IVideoDriver *driver, scene::ISceneManager *smgr,
                Camera &camera, Client &client, LocalPlayer *player, Hud &hud,
-               Minimap &mapper, gui::IGUIEnvironment *guienv,
+               Minimap *mapper, gui::IGUIEnvironment *guienv,
                const v2u32 &screensize, const video::SColor &skycolor,
                bool show_hud, bool show_minimap)
 {
@@ -584,8 +584,8 @@ void draw_scene(video::IVideoDriver *driver, scene::ISceneManager *smgr,
                hud.drawLuaElements(camera.getOffset());
                camera.drawNametags();
 
-               if (show_minimap)
-                       mapper.drawMinimap();
+               if (mapper && show_minimap)
+                       mapper->drawMinimap();
        }
 
        guienv->drawAll();