Lower the default max_users from 100 to 15

[dragonfireclient.git] / src / game.cpp

diff --git a/src/game.cpp b/src/game.cpp
index d3d49d7b431142f4b8aa41ce5028a2db438930f8..851f5dd9ddeb1703daf3b0ece16cade901bfdbe6 100644 (file)
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1456,6 +1456,8 @@ void the_game(
        Hud hud(driver, guienv, font, text_height,
                        gamedef, player, &local_inventory);
 
+       bool use_weather = g_settings->getBool("weather");
+
        for(;;)
        {
                if(device->run() == false || kill == true)
@@ -1720,7 +1722,7 @@ void the_game(
                        GUIFormSpecMenu *menu =
                                new GUIFormSpecMenu(device, guiroot, -1,
                                        &g_menumgr,
-                                       &client, gamedef);
+                                       &client, gamedef, tsrc);
 
                        InventoryLocation inventoryloc;
                        inventoryloc.setCurrentPlayer();
@@ -2259,7 +2261,7 @@ void the_game(
                                                GUIFormSpecMenu *menu =
                                                                new GUIFormSpecMenu(device, guiroot, -1,
                                                                                &g_menumgr,
-                                                                               &client, gamedef);
+                                                                               &client, gamedef, tsrc);
                                                menu->setFormSource(current_formspec);
                                                menu->setTextDest(current_textdest);
                                                menu->drop();
@@ -2755,7 +2757,7 @@ void the_game(
                                        GUIFormSpecMenu *menu =
                                                new GUIFormSpecMenu(device, guiroot, -1,
                                                        &g_menumgr,
-                                                       &client, gamedef);
+                                                       &client, gamedef, tsrc);
                                        menu->setFormSpec(meta->getString("formspec"),
                                                        inventoryloc);
                                        menu->setFormSource(new NodeMetadataFormSource(
@@ -2860,6 +2862,8 @@ void the_game(
                        fog_range = 100000*BS;
                else {
                        fog_range = draw_control.wanted_range*BS + 0.0*MAP_BLOCKSIZE*BS;
+                       if(use_weather)
+                               fog_range *= (1.5 - 1.4*(float)client.getEnv().getClientMap().getHumidity(pos_i)/100);
                        fog_range = MYMIN(fog_range, (draw_control.farthest_drawn+20)*BS);
                        fog_range *= 0.9;
                }
@@ -3199,6 +3203,11 @@ void the_game(
 
                                smgr->drawAll(); // 'smgr->drawAll();' may go here
 
+                               driver->setTransform(video::ETS_WORLD, core::IdentityMatrix);
+
+                               if (show_hud)
+                                       hud.drawSelectionBoxes(hilightboxes);
+
 
                                //Right eye...
                                irr::core::vector3df rightEye;
@@ -3223,6 +3232,11 @@ void the_game(
 
                                smgr->drawAll(); // 'smgr->drawAll();' may go here
 
+                               driver->setTransform(video::ETS_WORLD, core::IdentityMatrix);
+
+                               if (show_hud)
+                                       hud.drawSelectionBoxes(hilightboxes);
+
 
                                //driver->endScene();
 
@@ -3251,9 +3265,11 @@ void the_game(
                driver->setMaterial(m);
 
                driver->setTransform(video::ETS_WORLD, core::IdentityMatrix);
-
-               if (show_hud)
+               if((!g_settings->getBool("anaglyph")) && (show_hud))
+               {
                        hud.drawSelectionBoxes(hilightboxes);
+               }
+
                /*
                        Wielded tool
                */