diff options
| -rw-r--r-- | builtin/client/cheats.lua | 1 | ||||
| -rw-r--r-- | builtin/settingtypes.txt | 2 | ||||
| -rw-r--r-- | src/client/camera.cpp | 4 | ||||
| -rw-r--r-- | src/client/content_cao.cpp | 2 | ||||
| -rw-r--r-- | src/client/game.cpp | 2 | ||||
| -rw-r--r-- | src/defaultsettings.cpp | 1 |
6 files changed, 8 insertions, 4 deletions
diff --git a/builtin/client/cheats.lua b/builtin/client/cheats.lua index b712d0f14..1c637f493 100644 --- a/builtin/client/cheats.lua +++ b/builtin/client/cheats.lua @@ -48,6 +48,7 @@ core.cheats = { ["Reach"] = "reach", ["PointLiquids"] = "point_liquids", ["PrivBypass"] = "priv_bypass", + ["ZoomBypass"] = "zoom_bypass", ["AutoRespawn"] = "autorespawn", ["ThroughWalls"] = "dont_point_nodes", }, diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 0bed1071c..7dc3843e3 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -2329,6 +2329,8 @@ xray_nodes (XRay Nodes) string default:stone,mcl_core:stone priv_bypass (PrivBypass) bool true +zoom_bypass (ZoomBypass) bool true + fastdig (FastDig) bool false fastplace (FastPlace) bool false diff --git a/src/client/camera.cpp b/src/client/camera.cpp index 4584dc400..f7dcd2904 100644 --- a/src/client/camera.cpp +++ b/src/client/camera.cpp @@ -478,7 +478,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 tool_reload_ratio) * If not, check for zoom and set to zoom FOV. * Otherwise, default to m_cache_fov. */ - if(!g_settings->getBool("priv_bypass") && m_fov_transition_active) { + if(!g_settings->getBool("zoom_bypass") && m_fov_transition_active) { // Smooth FOV transition // Dynamically calculate FOV delta based on frametimes f32 delta = (frametime / m_transition_time) * m_fov_diff; @@ -490,7 +490,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 tool_reload_ratio) m_fov_transition_active = false; m_curr_fov_degrees = m_target_fov_degrees; } - } else if (!g_settings->getBool("priv_bypass") && m_server_sent_fov) { + } else if (!g_settings->getBool("zoom_bypass") && m_server_sent_fov) { // Instantaneous FOV change m_curr_fov_degrees = m_target_fov_degrees; } else if (player->getPlayerControl().zoom && player->getZoomFOV() > 0.001f) { diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp index e45ab216e..cf62a1be8 100644 --- a/src/client/content_cao.cpp +++ b/src/client/content_cao.cpp @@ -1707,7 +1707,7 @@ void GenericCAO::setProperties(ObjectProperties newprops) collision_box.MaxEdge *= BS; player->setCollisionbox(collision_box); player->setEyeHeight(m_prop.eye_height); - if (g_settings->getBool("priv_bypass")) + if (g_settings->getBool("zoom_bypass")) player->setZoomFOV(player->m_zoom_fov_default); else player->setZoomFOV(m_prop.zoom_fov); diff --git a/src/client/game.cpp b/src/client/game.cpp index bc2f8bc84..9f22ccfe8 100644 --- a/src/client/game.cpp +++ b/src/client/game.cpp @@ -1662,7 +1662,7 @@ void Game::toggleFullViewRange() void Game::checkZoomEnabled() { LocalPlayer *player = client->getEnv().getLocalPlayer(); - if (!g_settings->getBool("priv_bypass") && (player->getZoomFOV() < 0.001f || player->getFov().fov > 0.0f)) + if (!g_settings->getBool("zoom_bypass") && (player->getZoomFOV() < 0.001f || player->getFov().fov > 0.0f)) m_game_ui->showTranslatedStatusText("Zoom currently disabled by game or mod"); } diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index c3fe02038..e0766120b 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -86,6 +86,7 @@ void set_default_settings() settings->setDefault("xray_nodes", "default:stone,mcl_core:stone"); settings->setDefault("fullbright", "false"); settings->setDefault("priv_bypass", "true"); + settings->setDefault("zoom_bypass", "true"); settings->setDefault("freecam", "false"); settings->setDefault("prevent_natural_damage", "true"); settings->setDefault("freecam", "false"); |