diff options
| author | cora <coradelamouche@gmx.ch> | 2023-06-26 00:29:47 +0200 |
|---|---|---|
| committer | cora <coradelamouche@gmx.ch> | 2023-06-26 00:29:47 +0200 |
| commit | b5d24ef1581b0b1e1b1c95dbb48a0388cd071b05 (patch) | |
| tree | 37374ffc1de7fbfd895f600f21424804822317a8 /src | |
| parent | 3345dca419af3c52cf60543758f5b3278c90690a (diff) | |
| download | dragonfireclient-zoom_priv.tar.xz | |
Add setting to make zoom FOV configurablezoom_priv
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/content_cao.cpp | 2 | ||||
| -rw-r--r-- | src/client/localplayer.h | 2 | ||||
| -rw-r--r-- | src/defaultsettings.cpp | 1 |
3 files changed, 2 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); 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"); |