Fix regression (increase/decrease viewing range with +/- keys)
authorCraig Robbins <kde.psych@gmail.com>
Sun, 7 Dec 2014 08:21:13 +0000 (18:21 +1000)
committerCraig Robbins <kde.psych@gmail.com>
Sun, 7 Dec 2014 08:32:30 +0000 (18:32 +1000)
src/camera.cpp
src/camera.h

index db53cd5d9a5d94707eef0c6ab90d1b6c5c639115..14ad99b30909f98f6bee58c007877950118f6b49 100644 (file)
@@ -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
index a0de13d2a5105084eb613684c7e35d77c1b01336..3f10b87d7887ffd26cd74627ab88a915b9ecd870 100644 (file)
@@ -212,8 +212,6 @@ private:
 
        f32 m_cache_fall_bobbing_amount;
        f32 m_cache_view_bobbing_amount;
-       f32 m_cache_viewing_range_min;
-       f32 m_cache_viewing_range_max;
        f32 m_cache_wanted_fps;
        f32 m_cache_fov;
        bool m_cache_view_bobbing;