summaryrefslogtreecommitdiff
path: root/src/camera.cpp
diff options
context:
space:
mode:
authorCraig Robbins <kde.psych@gmail.com>2014-12-07 18:21:13 +1000
committerCraig Robbins <kde.psych@gmail.com>2014-12-07 18:32:30 +1000
commit500f69142689d2646745d1b6a48187e913b452ac (patch)
treeafd2e2c5117c3d6c1c49d313d9081f0040a3f815 /src/camera.cpp
parent2f134ce24fa3c9e32f0bbe063adc8114d70091de (diff)
downloadminetest-500f69142689d2646745d1b6a48187e913b452ac.tar.gz
minetest-500f69142689d2646745d1b6a48187e913b452ac.tar.bz2
minetest-500f69142689d2646745d1b6a48187e913b452ac.zip
Fix regression (increase/decrease viewing range with +/- keys)
Diffstat (limited to 'src/camera.cpp')
-rw-r--r--src/camera.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/camera.cpp b/src/camera.cpp
index db53cd5d9..14ad99b30 100644
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -109,8 +109,6 @@ Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control,
*/
m_cache_fall_bobbing_amount = g_settings->getFloat("fall_bobbing_amount");
m_cache_view_bobbing_amount = g_settings->getFloat("view_bobbing_amount");
- m_cache_viewing_range_min = g_settings->getFloat("viewing_range_nodes_min");
- m_cache_viewing_range_max = g_settings->getFloat("viewing_range_nodes_max");
m_cache_wanted_fps = g_settings->getFloat("wanted_fps");
m_cache_fov = g_settings->getFloat("fov");
m_cache_view_bobbing = g_settings->getBool("view_bobbing");
@@ -539,10 +537,10 @@ void Camera::updateViewingRange(f32 frametime_in, f32 busytime_in)
<<std::endl;*/
// Get current viewing range and FPS settings
- f32 viewing_range_min = m_cache_viewing_range_min;
+ f32 viewing_range_min = g_settings->getFloat("viewing_range_nodes_min");
viewing_range_min = MYMAX(15.0, viewing_range_min);
- f32 viewing_range_max = m_cache_viewing_range_max;
+ f32 viewing_range_max = g_settings->getFloat("viewing_range_nodes_max");
viewing_range_max = MYMAX(viewing_range_min, viewing_range_max);
// Immediately apply hard limits