From e4bc5fb900a91362c8427ed824650b2d8467f213 Mon Sep 17 00:00:00 2001 From: SmallJoker Date: Fri, 11 Nov 2022 20:18:57 +0100 Subject: [PATCH] Allow zoom even with overwritten default FOV --- src/client/camera.cpp | 6 +++--- src/client/game.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/client/camera.cpp b/src/client/camera.cpp index ba621d15b..dc64c027e 100644 --- a/src/client/camera.cpp +++ b/src/client/camera.cpp @@ -494,12 +494,12 @@ 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 (m_server_sent_fov) { - // Instantaneous FOV change - m_curr_fov_degrees = m_target_fov_degrees; } else if (player->getPlayerControl().zoom && player->getZoomFOV() > 0.001f) { // Player requests zoom, apply zoom FOV m_curr_fov_degrees = player->getZoomFOV(); + } else if (m_server_sent_fov) { + // Instantaneous FOV change + m_curr_fov_degrees = m_target_fov_degrees; } else { // Set to client's selected FOV m_curr_fov_degrees = m_cache_fov; diff --git a/src/client/game.cpp b/src/client/game.cpp index fd6a11563..f69ee4201 100644 --- a/src/client/game.cpp +++ b/src/client/game.cpp @@ -2502,7 +2502,7 @@ void Game::toggleFullViewRange() void Game::checkZoomEnabled() { LocalPlayer *player = client->getEnv().getLocalPlayer(); - if (player->getZoomFOV() < 0.001f || player->getFov().fov > 0.0f) + if (player->getZoomFOV() < 0.001f) m_game_ui->showTranslatedStatusText("Zoom currently disabled by game or mod"); }