LuaVoxelManip: Add option to allocate blank data

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

diff --git a/src/game.cpp b/src/game.cpp
index a2944d309e048b69c213ccec0b33fd2b10cd5ea0..5d53c67d2556f9d47b8faaca34522ee14ec9e7cb 100644 (file)
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -439,7 +439,7 @@ PointedThing getPointedThing(Client *client, v3f player_position,
 /* Profiler display */
 
 void update_profiler_gui(gui::IGUIStaticText *guitext_profiler, FontEngine *fe,
-               u32 show_profiler, u32 show_profiler_max)
+               u32 show_profiler, u32 show_profiler_max, s32 screen_height)
 {
        if (show_profiler == 0) {
                guitext_profiler->setVisible(false);
@@ -456,9 +456,20 @@ void update_profiler_gui(gui::IGUIStaticText *guitext_profiler, FontEngine *fe,
                if (w < 400)
                        w = 400;
 
-               core::rect<s32> rect(6, 4 + (fe->getTextHeight() + 5) * 2, 12 + w,
-                                    8 + (fe->getTextHeight() + 5) * 2 +
-                                    fe->getTextHeight());
+               unsigned text_height = fe->getTextHeight();
+
+               core::position2di upper_left, lower_right;
+
+               upper_left.X  = 6;
+               upper_left.Y  = (text_height + 5) * 2;
+               lower_right.X = 12 + w;
+               lower_right.Y = upper_left.Y + (text_height + 1) * MAX_PROFILER_TEXT_ROWS;
+
+               if (lower_right.Y > screen_height * 2 / 3)
+                       lower_right.Y = screen_height * 2 / 3;
+
+               core::rect<s32> rect(upper_left, lower_right);
+
                guitext_profiler->setRelativePosition(rect);
                guitext_profiler->setVisible(true);
        }
@@ -1686,6 +1697,8 @@ bool Game::startup(bool *kill,
        driver              = device->getVideoDriver();
        smgr                = device->getSceneManager();
 
+       smgr->getParameters()->setAttribute(scene::OBJ_LOADER_IGNORE_MATERIAL_FILES, true);
+
        if (!init(map_dir, address, port, gamespec))
                return false;
 
@@ -2366,7 +2379,8 @@ void Game::updateProfilers(const GameRunData &run_data, const RunStats &stats,
                }
 
                update_profiler_gui(guitext_profiler, g_fontengine,
-                               run_data.profiler_current_page, run_data.profiler_max_page);
+                               run_data.profiler_current_page, run_data.profiler_max_page,
+                               driver->getScreenSize().Height);
 
                g_profiler->clear();
        }
@@ -2778,7 +2792,7 @@ void Game::toggleProfiler(float *statustext_time, u32 *profiler_current_page,
 
        // FIXME: This updates the profiler with incomplete values
        update_profiler_gui(guitext_profiler, g_fontengine, *profiler_current_page,
-                       profiler_max_page);
+                       profiler_max_page, driver->getScreenSize().Height);
 
        if (*profiler_current_page != 0) {
                std::wstringstream sstr;