Fix calculating if block is in viewing range; fix fog and default minimum accordingly

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 2b6cb7f53794b891487c8a599fdac72701bcbf26..78a1d0aa1013b590c371cebbc9657071c6adec94 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -65,7 +65,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("wanted_fps", "30");
        settings->setDefault("fps_max", "60");
        settings->setDefault("viewing_range_nodes_max", "300");
-       settings->setDefault("viewing_range_nodes_min", "15");
+       settings->setDefault("viewing_range_nodes_min", "35");
        settings->setDefault("screenW", "800");
        settings->setDefault("screenH", "600");
        settings->setDefault("address", "");

diff --git a/src/game.cpp b/src/game.cpp
index a1f0fe07fd95288a7398ed496235ac52d975456d..5302918625aeacda9c19130b0003598cbf14feec 100644 (file)
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -2174,7 +2174,7 @@ void the_game(
                        }
                        else
                        {
-                               range = draw_control.wanted_range*BS + MAP_BLOCKSIZE*BS*1.5;
+                               range = draw_control.wanted_range*BS + 0.0*MAP_BLOCKSIZE*BS;
                                range *= 0.9;
                                if(draw_control.range_all)
                                        range = 100000*BS;

diff --git a/src/utility.cpp b/src/utility.cpp
index 06b60884f8b547485e8ec8426eeb65f0d7398251..7c87b9ae4f06e326279c20ac0d31a030964ba724 100644 (file)
--- a/src/utility.cpp
+++ b/src/utility.cpp
@@ -208,7 +208,7 @@ bool isBlockInSight(v3s16 blockpos_b, v3f camera_pos, v3f camera_dir,
                return true;
 
        // If block is far away, it's not in sight
-       if(d > range * BS)
+       if(d > range)
                return false;
 
        // Maximum radius of a block