diff options
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/content_cao.cpp | 2 | ||||
| -rw-r--r-- | src/client/localplayer.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp index cf62a1be8..1402f45ba 100644 --- a/src/client/content_cao.cpp +++ b/src/client/content_cao.cpp @@ -1708,7 +1708,7 @@ void GenericCAO::setProperties(ObjectProperties newprops) player->setCollisionbox(collision_box); player->setEyeHeight(m_prop.eye_height); if (g_settings->getBool("zoom_bypass")) - player->setZoomFOV(player->m_zoom_fov_default); + player->setZoomFOV(g_settings->getFloat("zoom_bypass_fov")); else player->setZoomFOV(m_prop.zoom_fov); } diff --git a/src/client/localplayer.h b/src/client/localplayer.h index 2c4e6f990..271589c59 100644 --- a/src/client/localplayer.h +++ b/src/client/localplayer.h @@ -71,8 +71,6 @@ public: // Temporary option for old move code bool physics_override_new_move = true; - const float m_zoom_fov_default = 15.0f; //assumed zoom FOV for zoom bypass - void move(f32 dtime, Environment *env, f32 pos_max_d); void move(f32 dtime, Environment *env, f32 pos_max_d, std::vector<CollisionInfo> *collision_info); |