Adjust Android default view range and mapblock limit

This commit is contained in:
sfan5 2025-03-01 00:32:38 +01:00
parent 062207e696
commit c3477a4d08
2 changed files with 7 additions and 5 deletions

View file

@ -112,7 +112,7 @@ void set_default_settings()
settings->setDefault("screenshot_format", "png");
settings->setDefault("screenshot_quality", "0");
settings->setDefault("client_unload_unused_data_timeout", "600");
settings->setDefault("client_mapblock_limit", "7500");
settings->setDefault("client_mapblock_limit", "7500"); // about 120 MB
settings->setDefault("enable_build_where_you_stand", "false");
settings->setDefault("curl_timeout", "20000");
settings->setDefault("curl_parallel_limit", "8");
@ -547,6 +547,7 @@ void set_default_settings()
settings->setDefault("virtual_joystick_triggers_aux1", "false");
settings->setDefault("touch_punch_gesture", "short_tap");
settings->setDefault("clickable_chat_weblinks", "true");
// Altered settings for Android
#ifdef __ANDROID__
settings->setDefault("screen_w", "0");
@ -558,9 +559,9 @@ void set_default_settings()
settings->setDefault("max_block_generate_distance", "5");
settings->setDefault("sqlite_synchronous", "1");
settings->setDefault("server_map_save_interval", "15");
settings->setDefault("client_mapblock_limit", "1000");
settings->setDefault("client_mapblock_limit", "1500");
settings->setDefault("active_block_range", "2");
settings->setDefault("viewing_range", "50");
settings->setDefault("viewing_range", "70");
settings->setDefault("leaves_style", "simple");
// Note: OpenGL ES 2.0 is not guaranteed to provide depth textures,
// which we would need for PP.
@ -568,6 +569,7 @@ void set_default_settings()
// still set these two settings in case someone wants to enable it
settings->setDefault("debanding", "false");
settings->setDefault("post_processing_texture_bits", "8");
// We don't have working certificate verification...
settings->setDefault("curl_verify_cert", "false");
// Apply settings according to screen size

View file

@ -106,9 +106,9 @@ EmergeManager::EmergeManager(Server *server, MetricsBackend *mb)
m_qlimit_generate = nthreads + 1;
// don't trust user input for something very important like this
m_qlimit_total = rangelim(m_qlimit_total, 1, 1000000);
m_qlimit_diskonly = rangelim(m_qlimit_diskonly, 1, 1000000);
m_qlimit_diskonly = rangelim(m_qlimit_diskonly, 2, 1000000);
m_qlimit_generate = rangelim(m_qlimit_generate, 1, 1000000);
m_qlimit_total = std::max(m_qlimit_diskonly, m_qlimit_generate);
for (s16 i = 0; i < nthreads; i++)
m_threads.push_back(new EmergeThread(server, i));