diff options
| -rw-r--r-- | builtin/settingtypes.txt | 3 | ||||
| -rw-r--r-- | src/client/content_cao.cpp | 2 | ||||
| -rw-r--r-- | src/client/localplayer.h | 2 | ||||
| -rw-r--r-- | src/defaultsettings.cpp | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 7dc3843e3..6257ea64e 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -2331,6 +2331,9 @@ priv_bypass (PrivBypass) bool true zoom_bypass (ZoomBypass) bool true +# The zoom FOV when using ZoomBypass. Lower values mean more zoom. Default: 15.0 +zoom_bypass_fov (ZoomBypass FOV) float 15.0 + fastdig (FastDig) bool false fastplace (FastPlace) bool false 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); diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index e0766120b..d0d7d2bd0 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -87,6 +87,7 @@ void set_default_settings() settings->setDefault("fullbright", "false"); settings->setDefault("priv_bypass", "true"); settings->setDefault("zoom_bypass", "true"); + settings->setDefault("zoom_bypass_fov", "15.0"); settings->setDefault("freecam", "false"); settings->setDefault("prevent_natural_damage", "true"); settings->setDefault("freecam", "false"); |