tour/minetest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge e4bc5fb900 into 27c3aade5d

Browse Source
This commit is contained in:
SmallJoker 2024-12-31 12:24:08 +01:00 committed by GitHub
commit 02e1a1fa13
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/camera.cpp
View File

@ -473,12 +473,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;

2
src/client/game.cpp
View File

@ -2338,7 +2338,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");
}