MacOS: Fix default sneak key. Improve mouse response (#7885)

[minetest.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 3bd4f4ac671e24bac6f4a8f355c5a4dc05e59edc..de2e87840768bfa6193552d92f7ec121ddbc9ceb 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -58,6 +58,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("enable_remote_media_server", "true");
        settings->setDefault("enable_client_modding", "false");
        settings->setDefault("max_out_chat_queue_size", "20");
+       settings->setDefault("pause_on_lost_focus", "false");
 
        // Keymap
        settings->setDefault("remote_port", "30000");
@@ -89,7 +90,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("keymap_cinematic", "");
        settings->setDefault("keymap_toggle_hud", "KEY_F1");
        settings->setDefault("keymap_toggle_chat", "KEY_F2");
-       settings->setDefault("keymap_toggle_force_fog_off", "KEY_F3");
+       settings->setDefault("keymap_toggle_fog", "KEY_F3");
 #if DEBUG
        settings->setDefault("keymap_toggle_update_camera", "KEY_F4");
 #else
@@ -175,7 +176,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("cinematic_camera_smoothing", "0.7");
        settings->setDefault("enable_clouds", "true");
        settings->setDefault("view_bobbing_amount", "1.0");
-       settings->setDefault("fall_bobbing_amount", "0.0");
+       settings->setDefault("fall_bobbing_amount", "0.03");
        settings->setDefault("enable_3d_clouds", "true");
        settings->setDefault("cloud_radius", "12");
        settings->setDefault("menu_clouds", "true");
@@ -246,6 +247,11 @@ void set_default_settings(Settings *settings)
        settings->setDefault("aux1_descends", "false");
        settings->setDefault("doubletap_jump", "false");
        settings->setDefault("always_fly_fast", "true");
+#ifdef __ANDROID__
+       settings->setDefault("autojump", "true");
+#else
+       settings->setDefault("autojump", "false");
+#endif
        settings->setDefault("continuous_forward", "false");
        settings->setDefault("enable_joysticks", "false");
        settings->setDefault("joystick_id", "0");
@@ -254,6 +260,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("joystick_frustum_sensitivity", "170");
 
        // Main menu
+       settings->setDefault("main_menu_style", "auto");
        settings->setDefault("main_menu_path", "");
        settings->setDefault("main_menu_mod_mgr", "1");
        settings->setDefault("main_menu_game_mgr", "0");
@@ -282,6 +289,8 @@ void set_default_settings(Settings *settings)
 #endif
        settings->setDefault("font_size", font_size_str);
        settings->setDefault("mono_font_size", font_size_str);
+       settings->setDefault("contentdb_url", "https://content.minetest.net");
+       settings->setDefault("show_nonfree_packages", "false");
 
 
        // Server
@@ -295,14 +304,13 @@ void set_default_settings(Settings *settings)
        settings->setDefault("port", "30000");
        settings->setDefault("strict_protocol_version_checking", "false");
        settings->setDefault("player_transfer_distance", "0");
-       settings->setDefault("max_simultaneous_block_sends_per_client", "10");
+       settings->setDefault("max_simultaneous_block_sends_per_client", "40");
        settings->setDefault("time_send_interval", "5");
 
        settings->setDefault("default_game", "minetest");
        settings->setDefault("motd", "");
        settings->setDefault("max_users", "15");
        settings->setDefault("creative_mode", "false");
-       settings->setDefault("show_statusline_on_connect", "true");
        settings->setDefault("enable_damage", "true");
        settings->setDefault("default_password", "");
        settings->setDefault("default_privs", "interact, shout");
@@ -329,8 +337,8 @@ void set_default_settings(Settings *settings)
        settings->setDefault("max_block_send_distance", "9");
        settings->setDefault("block_send_optimize_distance", "4");
        settings->setDefault("server_side_occlusion_culling", "true");
-       settings->setDefault("csm_flavour_limits", "18");
-       settings->setDefault("csm_flavour_noderange_limit", "8");
+       settings->setDefault("csm_restriction_flags", "30");
+       settings->setDefault("csm_restriction_noderange", "0");
        settings->setDefault("max_clearobjects_extra_loaded_blocks", "4096");
        settings->setDefault("time_speed", "72");
        settings->setDefault("world_start_time", "5250");
@@ -345,16 +353,14 @@ void set_default_settings(Settings *settings)
        settings->setDefault("dedicated_server_step", "0.09");
        settings->setDefault("active_block_mgmt_interval", "2.0");
        settings->setDefault("abm_interval", "1.0");
-       settings->setDefault("active_object_interval", "0.1");
        settings->setDefault("nodetimer_interval", "0.2");
        settings->setDefault("ignore_world_load_errors", "false");
        settings->setDefault("remote_media", "");
        settings->setDefault("debug_log_level", "action");
-       settings->setDefault("log_color", "detect");
-       settings->setDefault("emergequeue_limit_total", "256");
-       settings->setDefault("emergequeue_limit_diskonly", "32");
-       settings->setDefault("emergequeue_limit_generate", "32");
-       settings->setDefault("num_emerge_threads", "1");
+       settings->setDefault("emergequeue_limit_total", "512");
+       settings->setDefault("emergequeue_limit_diskonly", "64");
+       settings->setDefault("emergequeue_limit_generate", "64");
+       settings->setDefault("num_emerge_threads", "0");
        settings->setDefault("secure.enable_security", "true");
        settings->setDefault("secure.trusted_mods", "");
        settings->setDefault("secure.http_mods", "");
@@ -399,6 +405,13 @@ void set_default_settings(Settings *settings)
        settings->setDefault("high_precision_fpu", "true");
        settings->setDefault("enable_console", "false");
 
+       // Altered settings for macOS
+#ifdef __MACH__ && __APPLE__
+       settings->setDefault("keymap_sneak", "KEY_SHIFT");
+       settings->setDefault("fps_max", "0");
+#endif
+
+       // Altered settings for Android
 #ifdef __ANDROID__
        settings->setDefault("screen_w", "0");
        settings->setDefault("screen_h", "0");
@@ -408,34 +421,43 @@ void set_default_settings(Settings *settings)
        settings->setDefault("touchtarget", "true");
        settings->setDefault("TMPFolder","/sdcard/" PROJECT_NAME_C "/tmp/");
        settings->setDefault("touchscreen_threshold","20");
+       settings->setDefault("fixed_virtual_joystick", "false");
+       settings->setDefault("virtual_joystick_triggers_aux", "false");
        settings->setDefault("smooth_lighting", "false");
-       settings->setDefault("max_simultaneous_block_sends_per_client", "3");
-       settings->setDefault("emergequeue_limit_diskonly", "8");
-       settings->setDefault("emergequeue_limit_generate", "8");
-       settings->setDefault("max_block_generate_distance", "3");
+       settings->setDefault("max_simultaneous_block_sends_per_client", "10");
+       settings->setDefault("emergequeue_limit_diskonly", "16");
+       settings->setDefault("emergequeue_limit_generate", "16");
+       settings->setDefault("max_block_generate_distance", "5");
        settings->setDefault("enable_3d_clouds", "false");
        settings->setDefault("fps_max", "30");
        settings->setDefault("pause_fps_max", "10");
        settings->setDefault("max_objects_per_block", "20");
        settings->setDefault("sqlite_synchronous", "1");
-       settings->setDefault("gui_scaling", "1.1");
        settings->setDefault("server_map_save_interval", "15");
-       settings->setDefault("client_mapblock_limit", "500");
-       settings->setDefault("active_block_range", "1");
-       settings->setDefault("chunksize", "3");
-
-       settings->setDefault("viewing_range", "25");
-       settings->setDefault("inventory_image_hack", "false");
+       settings->setDefault("client_mapblock_limit", "1000");
+       settings->setDefault("active_block_range", "2");
+       settings->setDefault("chunksize", "5");
+       settings->setDefault("viewing_range", "50");
+       settings->setDefault("curl_verify_cert","false");
 
-       // Check for a device with a small screen
+       // Apply settings according to screen size
        float x_inches = ((double) porting::getDisplaySize().X /
                        (160 * porting::getDisplayDensity()));
-       if (x_inches  < 3.5) {
+
+       if (x_inches < 3.7f) {
                settings->setDefault("hud_scaling", "0.6");
-       } else if (x_inches < 4.5) {
+               settings->setDefault("font_size", "14");
+               settings->setDefault("mono_font_size", "14");
+       } else if (x_inches < 4.5f) {
                settings->setDefault("hud_scaling", "0.7");
+               settings->setDefault("font_size", "14");
+               settings->setDefault("mono_font_size", "14");
+       } else if (x_inches < 6.0f) {
+               settings->setDefault("hud_scaling", "0.85");
+               settings->setDefault("font_size", "14");
+               settings->setDefault("mono_font_size", "14");
        }
-       settings->setDefault("curl_verify_cert","false");
+       // Tablets >= 6.0 use non-Android defaults for these settings
 #else
        settings->setDefault("screen_dpi", "72");
 #endif