oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-09-30 19:22:14 +00:00
Code Wiki Activity

Merge b2934a27ba into 421835a30e

Browse source
This commit is contained in:
lhofhansl 2025-09-25 10:55:26 +03:00 • committed by GitHub
commit a6814590fa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/client/game.cpp
View file

@ -2567,20 +2567,14 @@ inline void Game::step(f32 dtime)
ZoneScoped; ZoneScoped;
if (server) { if (server) {
float fps_max = !device->isWindowFocused() && simple_singleplayer_mode ? float server_step;
g_settings->getFloat("fps_max_unfocused") : if(!device->isWindowFocused() && simple_singleplayer_mode)
g_settings->getFloat("fps_max"); server_step = 1.0f / std::max(g_settings->getFloat("fps_max_unfocused"), 1.0f);
fps_max = std::max(fps_max, 1.0f); else
/* server_step = g_settings->getFloat("dedicated_server_step");
* Unless you have a barebones game, running the server at more than 60Hz
* is hardly realistic and you're at the point of diminishing returns.
* fps_max is also not necessarily anywhere near the FPS actually achieved
* (also due to vsync).
*/
fps_max = std::min(fps_max, 60.0f);
server->setStepSettings(Server::StepSettings{ server->setStepSettings(Server::StepSettings{
1.0f / fps_max, server_step,
m_is_paused m_is_paused
}); });

14
src/defaultsettings.cpp
View file

@ -440,7 +440,7 @@ void set_default_settings()
settings->setDefault("strict_protocol_version_checking", "false"); settings->setDefault("strict_protocol_version_checking", "false");
settings->setDefault("protocol_version_min", "1"); settings->setDefault("protocol_version_min", "1");
settings->setDefault("player_transfer_distance", "0"); settings->setDefault("player_transfer_distance", "0");
settings->setDefault("max_simultaneous_block_sends_per_client", "40"); settings->setDefault("max_simultaneous_block_sends_per_client", "160");
settings->setDefault("motd", ""); settings->setDefault("motd", "");
settings->setDefault("max_users", "15"); settings->setDefault("max_users", "15");
@ -496,9 +496,9 @@ void set_default_settings()
settings->setDefault("debug_log_level", "action"); settings->setDefault("debug_log_level", "action");
settings->setDefault("debug_log_size_max", "50"); settings->setDefault("debug_log_size_max", "50");
settings->setDefault("chat_log_level", "error"); settings->setDefault("chat_log_level", "error");
settings->setDefault("emergequeue_limit_total", "1024"); settings->setDefault("emergequeue_limit_total", "4096");
settings->setDefault("emergequeue_limit_diskonly", "128"); settings->setDefault("emergequeue_limit_diskonly", "512");
settings->setDefault("emergequeue_limit_generate", "128"); settings->setDefault("emergequeue_limit_generate", "512");
settings->setDefault("num_emerge_threads", "1"); settings->setDefault("num_emerge_threads", "1");
settings->setDefault("secure.enable_security", "true"); settings->setDefault("secure.enable_security", "true");
settings->setDefault("secure.trusted_mods", ""); settings->setDefault("secure.trusted_mods", "");
@ -560,9 +560,9 @@ void set_default_settings()
settings->setDefault("screen_w", "0"); settings->setDefault("screen_w", "0");
settings->setDefault("screen_h", "0"); settings->setDefault("screen_h", "0");
settings->setDefault("performance_tradeoffs", "true"); settings->setDefault("performance_tradeoffs", "true");
settings->setDefault("max_simultaneous_block_sends_per_client", "10"); settings->setDefault("max_simultaneous_block_sends_per_client", "40");
settings->setDefault("emergequeue_limit_diskonly", "16"); settings->setDefault("emergequeue_limit_diskonly", "64");
settings->setDefault("emergequeue_limit_generate", "16"); settings->setDefault("emergequeue_limit_generate", "64");
settings->setDefault("max_block_generate_distance", "5"); settings->setDefault("max_block_generate_distance", "5");
settings->setDefault("sqlite_synchronous", "1"); settings->setDefault("sqlite_synchronous", "1");
settings->setDefault("server_map_save_interval", "15"); settings->setDefault("server_map_save_interval", "15");