Make m_media_fetch_threads to contain MediaFetchThread* instead of MediaFetchThread

[minetest.git] / src / game.cpp

diff --git a/src/game.cpp b/src/game.cpp
index fc780a808519af892f03fb973d400ebba276c20a..dbb71369fbaf1da3ab9d397af74fa30c6cde8d47 100644 (file)
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1214,7 +1214,7 @@ void the_game(
 
        // First line of debug text
        gui::IGUIStaticText *guitext = guienv->addStaticText(
-                       L"Minetest-c55",
+                       L"Minetest",
                        core::rect<s32>(5, 5, 795, 5+text_height),
                        false, false);
        // Second line of debug text
@@ -1665,6 +1665,23 @@ void the_game(
                                        statustext += L" (note: no 'fast' privilege)";
                        }
                }
+               else if(input->wasKeyDown(getKeySetting("keymap_noclip")))
+               {
+                       if(g_settings->getBool("noclip"))
+                       {
+                               g_settings->set("noclip","false");
+                               statustext = L"noclip disabled";
+                               statustext_time = 0;
+                       }
+                       else
+                       {
+                               g_settings->set("noclip","true");
+                               statustext = L"noclip enabled";
+                               statustext_time = 0;
+                               if(!client.checkPrivilege("noclip"))
+                                       statustext += L" (note: no 'noclip' privilege)";
+                       }
+               }
                else if(input->wasKeyDown(getKeySetting("keymap_screenshot")))
                {
                        irr::video::IImage* const image = driver->createScreenShot(); 
@@ -2505,8 +2522,7 @@ void the_game(
                        Calculate general brightness
                */
                u32 daynight_ratio = client.getEnv().getDayNightRatio();
-               float time_brightness = (float)decode_light(
-                               (daynight_ratio * LIGHT_SUN) / 1000) / 255.0;
+               float time_brightness = decode_light_f((float)daynight_ratio/1000.0);
                float direct_brightness = 0;
                bool sunlight_seen = false;
                if(g_settings->getBool("free_move")){
@@ -2608,7 +2624,7 @@ void the_game(
                //TimeTaker guiupdatetimer("Gui updating");
                
                const char program_name_and_version[] =
-                       "Minetest-c55 " VERSION_STRING;
+                       "Minetest " VERSION_STRING;
 
                if(show_debug)
                {
@@ -2959,11 +2975,6 @@ void the_game(
                //timer10.stop();
                //TimeTaker //timer11("//timer11");
 
-               /*
-                       Draw gui
-               */
-               // 0-1ms
-               guienv->drawAll();
 
                /*
                        Draw hotbar
@@ -2989,6 +3000,12 @@ void the_game(
                                        NULL);
                }
 
+               /*
+                       Draw gui
+               */
+               // 0-1ms
+               guienv->drawAll();
+
                /*
                        End scene
                */