From 500f69142689d2646745d1b6a48187e913b452ac Mon Sep 17 00:00:00 2001
From: Craig Robbins <kde.psych@gmail.com>
Date: Sun, 7 Dec 2014 18:21:13 +1000
Subject: [PATCH] Fix regression (increase/decrease viewing range with +/-
keys)
---
src/camera.cpp | 6 ++----
src/camera.h | 2 --
2 files changed, 2 insertions(+), 6 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
diff --git a/src/camera.h b/src/camera.h
index a0de13d2a..3f10b87d7 100644
--- a/src/camera.h
+++ b/src/camera.h
@@ -212,8 +212,6 @@ class Camera
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;
--
GitLab