]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/defaultsettings.cpp
Remove invalid fps_max on Mac
[dragonfireclient.git] / src / defaultsettings.cpp
index 277f56d2d1c4b2d9140bcc7762b46370971a7ce4..d350008146424078f54d9600d2f1ab35e6d15203 100644 (file)
@@ -17,16 +17,20 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include <IrrCompileConfig.h>
 #include "settings.h"
 #include "porting.h"
 #include "filesys.h"
 #include "config.h"
 #include "constants.h"
 #include "porting.h"
+#include "mapgen/mapgen.h" // Mapgen::setDefaultSettings
 #include "util/string.h"
 
-void set_default_settings(Settings *settings)
+void set_default_settings()
 {
+       Settings *settings = Settings::createLayer(SL_DEFAULTS);
+
        // Client and server
        settings->setDefault("language", "");
        settings->setDefault("name", "");
@@ -43,15 +47,16 @@ void set_default_settings(Settings *settings)
        settings->setDefault("meshgen_block_cache_size", "20");
        settings->setDefault("enable_vbo", "true");
        settings->setDefault("free_move", "false");
+       settings->setDefault("pitch_move", "false");
        settings->setDefault("fast_move", "false");
        settings->setDefault("noclip", "false");
-       settings->setDefault("screenshot_path", ".");
+       settings->setDefault("screenshot_path", "screenshots");
        settings->setDefault("screenshot_format", "png");
        settings->setDefault("screenshot_quality", "0");
        settings->setDefault("client_unload_unused_data_timeout", "600");
-       settings->setDefault("client_mapblock_limit", "5000");
+       settings->setDefault("client_mapblock_limit", "7500");
        settings->setDefault("enable_build_where_you_stand", "false");
-       settings->setDefault("curl_timeout", "5000");
+       settings->setDefault("curl_timeout", "20000");
        settings->setDefault("curl_parallel_limit", "8");
        settings->setDefault("curl_file_download_timeout", "300000");
        settings->setDefault("curl_verify_cert", "true");
@@ -59,6 +64,8 @@ void set_default_settings(Settings *settings)
        settings->setDefault("enable_client_modding", "false");
        settings->setDefault("max_out_chat_queue_size", "20");
        settings->setDefault("pause_on_lost_focus", "false");
+       settings->setDefault("enable_split_login_register", "true");
+       settings->setDefault("chat_weblink_color", "#8888FF");
 
        // Keymap
        settings->setDefault("remote_port", "30000");
@@ -69,17 +76,20 @@ void set_default_settings(Settings *settings)
        settings->setDefault("keymap_right", "KEY_KEY_D");
        settings->setDefault("keymap_jump", "KEY_SPACE");
        settings->setDefault("keymap_sneak", "KEY_LSHIFT");
+       settings->setDefault("keymap_dig", "KEY_LBUTTON");
+       settings->setDefault("keymap_place", "KEY_RBUTTON");
        settings->setDefault("keymap_drop", "KEY_KEY_Q");
        settings->setDefault("keymap_zoom", "KEY_KEY_Z");
        settings->setDefault("keymap_inventory", "KEY_KEY_I");
-       settings->setDefault("keymap_special1", "KEY_KEY_E");
+       settings->setDefault("keymap_aux1", "KEY_KEY_E");
        settings->setDefault("keymap_chat", "KEY_KEY_T");
        settings->setDefault("keymap_cmd", "/");
        settings->setDefault("keymap_cmd_local", ".");
-       settings->setDefault("keymap_minimap", "KEY_F9");
+       settings->setDefault("keymap_minimap", "KEY_KEY_V");
        settings->setDefault("keymap_console", "KEY_F10");
        settings->setDefault("keymap_rangeselect", "KEY_KEY_R");
        settings->setDefault("keymap_freemove", "KEY_KEY_K");
+       settings->setDefault("keymap_pitchmove", "KEY_KEY_P");
        settings->setDefault("keymap_fastmove", "KEY_KEY_J");
        settings->setDefault("keymap_noclip", "KEY_KEY_H");
        settings->setDefault("keymap_hotbar_next", "KEY_KEY_N");
@@ -88,6 +98,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("keymap_increase_volume", "");
        settings->setDefault("keymap_decrease_volume", "");
        settings->setDefault("keymap_cinematic", "");
+       settings->setDefault("keymap_toggle_block_bounds", "");
        settings->setDefault("keymap_toggle_hud", "KEY_F1");
        settings->setDefault("keymap_toggle_chat", "KEY_F2");
        settings->setDefault("keymap_toggle_fog", "KEY_F3");
@@ -98,7 +109,7 @@ void set_default_settings(Settings *settings)
 #endif
        settings->setDefault("keymap_toggle_debug", "KEY_F5");
        settings->setDefault("keymap_toggle_profiler", "KEY_F6");
-       settings->setDefault("keymap_camera_mode", "KEY_F7");
+       settings->setDefault("keymap_camera_mode", "KEY_KEY_C");
        settings->setDefault("keymap_screenshot", "KEY_F12");
        settings->setDefault("keymap_increase_viewing_range_min", "+");
        settings->setDefault("keymap_decrease_viewing_range_min", "-");
@@ -125,6 +136,15 @@ void set_default_settings(Settings *settings)
        settings->setDefault("keymap_slot21", "");
        settings->setDefault("keymap_slot22", "");
        settings->setDefault("keymap_slot23", "");
+       settings->setDefault("keymap_slot24", "");
+       settings->setDefault("keymap_slot25", "");
+       settings->setDefault("keymap_slot26", "");
+       settings->setDefault("keymap_slot27", "");
+       settings->setDefault("keymap_slot28", "");
+       settings->setDefault("keymap_slot29", "");
+       settings->setDefault("keymap_slot30", "");
+       settings->setDefault("keymap_slot31", "");
+       settings->setDefault("keymap_slot32", "");
 
        // Some (temporary) keys for debugging
        settings->setDefault("keymap_quicktune_prev", "KEY_HOME");
@@ -149,19 +169,21 @@ void set_default_settings(Settings *settings)
        settings->setDefault("tooltip_show_delay", "400");
        settings->setDefault("tooltip_append_itemname", "false");
        settings->setDefault("fps_max", "60");
-       settings->setDefault("pause_fps_max", "20");
-       settings->setDefault("viewing_range", "100");
+       settings->setDefault("fps_max_unfocused", "20");
+       settings->setDefault("viewing_range", "190");
+#if ENABLE_GLES
        settings->setDefault("near_plane", "0.1");
+#endif
        settings->setDefault("screen_w", "1024");
        settings->setDefault("screen_h", "600");
        settings->setDefault("autosave_screensize", "true");
        settings->setDefault("fullscreen", "false");
-       settings->setDefault("fullscreen_bpp", "24");
        settings->setDefault("vsync", "false");
        settings->setDefault("fov", "72");
        settings->setDefault("leaves_style", "fancy");
        settings->setDefault("connected_glass", "false");
        settings->setDefault("smooth_lighting", "true");
+       settings->setDefault("performance_tradeoffs", "false");
        settings->setDefault("lighting_alpha", "0.0");
        settings->setDefault("lighting_beta", "1.5");
        settings->setDefault("display_gamma", "1.0");
@@ -170,13 +192,21 @@ void set_default_settings(Settings *settings)
        settings->setDefault("lighting_boost_spread", "0.2");
        settings->setDefault("texture_path", "");
        settings->setDefault("shader_path", "");
+#if ENABLE_GLES
+#ifdef _IRR_COMPILE_WITH_OGLES1_
+       settings->setDefault("video_driver", "ogles1");
+#else
+       settings->setDefault("video_driver", "ogles2");
+#endif
+#else
        settings->setDefault("video_driver", "opengl");
+#endif
        settings->setDefault("cinematic", "false");
        settings->setDefault("camera_smoothing", "0");
        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");
@@ -201,13 +231,19 @@ void set_default_settings(Settings *settings)
        settings->setDefault("desynchronize_mapblock_texture_animation", "true");
        settings->setDefault("hud_hotbar_max_width", "1.0");
        settings->setDefault("enable_local_map_saving", "false");
-       settings->setDefault("show_entity_selectionbox", "true");
+       settings->setDefault("show_entity_selectionbox", "false");
        settings->setDefault("texture_clean_transparent", "false");
        settings->setDefault("texture_min_size", "64");
-       settings->setDefault("ambient_occlusion_gamma", "2.2");
+       settings->setDefault("ambient_occlusion_gamma", "1.8");
+#if ENABLE_GLES
+       settings->setDefault("enable_shaders", "false");
+#else
        settings->setDefault("enable_shaders", "true");
+#endif
        settings->setDefault("enable_particles", "true");
        settings->setDefault("arm_inertia", "true");
+       settings->setDefault("show_nametag_backgrounds", "true");
+       settings->setDefault("transparency_sorting_distance", "16");
 
        settings->setDefault("enable_minimap", "true");
        settings->setDefault("minimap_shape_round", "true");
@@ -221,15 +257,6 @@ void set_default_settings(Settings *settings)
        settings->setDefault("bilinear_filter", "false");
        settings->setDefault("trilinear_filter", "false");
        settings->setDefault("tone_mapping", "false");
-       settings->setDefault("enable_bumpmapping", "false");
-       settings->setDefault("enable_parallax_occlusion", "false");
-       settings->setDefault("generate_normalmaps", "false");
-       settings->setDefault("normalmaps_strength", "0.6");
-       settings->setDefault("normalmaps_smooth", "1");
-       settings->setDefault("parallax_occlusion_mode", "1");
-       settings->setDefault("parallax_occlusion_iterations", "4");
-       settings->setDefault("parallax_occlusion_scale", "0.08");
-       settings->setDefault("parallax_occlusion_bias", "0.04");
        settings->setDefault("enable_waving_water", "false");
        settings->setDefault("water_wave_height", "1.0");
        settings->setDefault("water_wave_length", "20.0");
@@ -237,59 +264,84 @@ void set_default_settings(Settings *settings)
        settings->setDefault("enable_waving_leaves", "false");
        settings->setDefault("enable_waving_plants", "false");
 
+       // Effects Shadows
+       settings->setDefault("enable_dynamic_shadows", "false");
+       settings->setDefault("shadow_strength_gamma", "1.0");
+       settings->setDefault("shadow_map_max_distance", "200.0");
+       settings->setDefault("shadow_map_texture_size", "2048");
+       settings->setDefault("shadow_map_texture_32bit", "true");
+       settings->setDefault("shadow_map_color", "false");
+       settings->setDefault("shadow_filters", "1");
+       settings->setDefault("shadow_poisson_filter", "true");
+       settings->setDefault("shadow_update_frames", "8");
+       settings->setDefault("shadow_soft_radius", "5.0");
+       settings->setDefault("shadow_sky_body_orbit_tilt", "0.0");
 
        // Input
        settings->setDefault("invert_mouse", "false");
        settings->setDefault("mouse_sensitivity", "0.2");
-       settings->setDefault("repeat_rightclick_time", "0.25");
+       settings->setDefault("repeat_place_time", "0.25");
        settings->setDefault("safe_dig_and_place", "false");
        settings->setDefault("random_input", "false");
        settings->setDefault("aux1_descends", "false");
        settings->setDefault("doubletap_jump", "false");
        settings->setDefault("always_fly_fast", "true");
+#ifdef HAVE_TOUCHSCREENGUI
+       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");
        settings->setDefault("joystick_type", "");
        settings->setDefault("repeat_joystick_button_time", "0.17");
        settings->setDefault("joystick_frustum_sensitivity", "170");
+       settings->setDefault("joystick_deadzone", "2048");
 
        // 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");
-       settings->setDefault("serverlist_file", "favoriteservers.txt");
+       settings->setDefault("serverlist_file", "favoriteservers.json");
 
-#if USE_FREETYPE
-       settings->setDefault("freetype", "true");
+       // General font settings
        settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "Arimo-Regular.ttf"));
+       settings->setDefault("font_path_italic", porting::getDataPath("fonts" DIR_DELIM "Arimo-Italic.ttf"));
+       settings->setDefault("font_path_bold", porting::getDataPath("fonts" DIR_DELIM "Arimo-Bold.ttf"));
+       settings->setDefault("font_path_bold_italic", porting::getDataPath("fonts" DIR_DELIM "Arimo-BoldItalic.ttf"));
+       settings->setDefault("font_bold", "false");
+       settings->setDefault("font_italic", "false");
        settings->setDefault("font_shadow", "1");
        settings->setDefault("font_shadow_alpha", "127");
+       settings->setDefault("font_size_divisible_by", "1");
        settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "Cousine-Regular.ttf"));
+       settings->setDefault("mono_font_path_italic", porting::getDataPath("fonts" DIR_DELIM "Cousine-Italic.ttf"));
+       settings->setDefault("mono_font_path_bold", porting::getDataPath("fonts" DIR_DELIM "Cousine-Bold.ttf"));
+       settings->setDefault("mono_font_path_bold_italic", porting::getDataPath("fonts" DIR_DELIM "Cousine-BoldItalic.ttf"));
+       settings->setDefault("mono_font_size_divisible_by", "1");
        settings->setDefault("fallback_font_path", porting::getDataPath("fonts" DIR_DELIM "DroidSansFallbackFull.ttf"));
 
-       settings->setDefault("fallback_font_shadow", "1");
-       settings->setDefault("fallback_font_shadow_alpha", "128");
-
        std::string font_size_str = std::to_string(TTF_DEFAULT_FONT_SIZE);
-
-       settings->setDefault("fallback_font_size", font_size_str);
-#else
-       settings->setDefault("freetype", "false");
-       settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "mono_dejavu_sans"));
-       settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "mono_dejavu_sans"));
-
-       std::string font_size_str = std::to_string(DEFAULT_FONT_SIZE);
-#endif
        settings->setDefault("font_size", font_size_str);
        settings->setDefault("mono_font_size", font_size_str);
+       settings->setDefault("chat_font_size", "0"); // Default "font_size"
+
+       // ContentDB
        settings->setDefault("contentdb_url", "https://content.minetest.net");
+       settings->setDefault("contentdb_max_concurrent_downloads", "3");
+
+#ifdef __ANDROID__
+       settings->setDefault("contentdb_flag_blacklist", "nonfree, android_default");
+#else
+       settings->setDefault("contentdb_flag_blacklist", "nonfree, desktop_default");
+#endif
 
 
        // Server
        settings->setDefault("disable_escape_sequences", "false");
        settings->setDefault("strip_color_codes", "false");
+#if USE_PROMETHEUS
+       settings->setDefault("prometheus_listener_address", "127.0.0.1:30000");
+#endif
 
        // Network
        settings->setDefault("enable_ipv6", "true");
@@ -298,7 +350,7 @@ 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");
@@ -313,47 +365,49 @@ void set_default_settings(Settings *settings)
        settings->setDefault("disallow_empty_password", "false");
        settings->setDefault("disable_anticheat", "false");
        settings->setDefault("enable_rollback_recording", "false");
-#ifdef NDEBUG
-       settings->setDefault("deprecated_lua_api_handling", "legacy");
-#else
        settings->setDefault("deprecated_lua_api_handling", "log");
-#endif
 
        settings->setDefault("kick_msg_shutdown", "Server shutting down.");
        settings->setDefault("kick_msg_crash", "This server has experienced an internal error. You will now be disconnected.");
        settings->setDefault("ask_reconnect_on_crash", "false");
 
+       settings->setDefault("chat_message_format", "<@name> @message");
        settings->setDefault("profiler_print_interval", "0");
-       settings->setDefault("active_object_send_range_blocks", "3");
-       settings->setDefault("active_block_range", "3");
+       settings->setDefault("active_object_send_range_blocks", "8");
+       settings->setDefault("active_block_range", "4");
        //settings->setDefault("max_simultaneous_block_sends_per_client", "1");
        // This causes frametime jitter on client side, or does it?
-       settings->setDefault("max_block_send_distance", "9");
+       settings->setDefault("max_block_send_distance", "12");
        settings->setDefault("block_send_optimize_distance", "4");
        settings->setDefault("server_side_occlusion_culling", "true");
-       settings->setDefault("csm_restriction_flags", "18");
-       settings->setDefault("csm_restriction_noderange", "8");
+       settings->setDefault("csm_restriction_flags", "62");
+       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");
+       settings->setDefault("world_start_time", "6125");
        settings->setDefault("server_unload_unused_data_timeout", "29");
-       settings->setDefault("max_objects_per_block", "64");
+       settings->setDefault("max_objects_per_block", "256");
        settings->setDefault("server_map_save_interval", "5.3");
        settings->setDefault("chat_message_max_size", "500");
        settings->setDefault("chat_message_limit_per_10sec", "8.0");
        settings->setDefault("chat_message_limit_trigger_kick", "50");
        settings->setDefault("sqlite_synchronous", "2");
+       settings->setDefault("map_compression_level_disk", "-1");
+       settings->setDefault("map_compression_level_net", "-1");
        settings->setDefault("full_block_send_enable_min_time_from_building", "2.0");
        settings->setDefault("dedicated_server_step", "0.09");
        settings->setDefault("active_block_mgmt_interval", "2.0");
        settings->setDefault("abm_interval", "1.0");
+       settings->setDefault("abm_time_budget", "0.2");
        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("emergequeue_limit_total", "256");
-       settings->setDefault("emergequeue_limit_diskonly", "32");
-       settings->setDefault("emergequeue_limit_generate", "32");
+       settings->setDefault("debug_log_size_max", "50");
+       settings->setDefault("chat_log_level", "error");
+       settings->setDefault("emergequeue_limit_total", "1024");
+       settings->setDefault("emergequeue_limit_diskonly", "128");
+       settings->setDefault("emergequeue_limit_generate", "128");
        settings->setDefault("num_emerge_threads", "1");
        settings->setDefault("secure.enable_security", "true");
        settings->setDefault("secure.trusted_mods", "");
@@ -381,13 +435,12 @@ void set_default_settings(Settings *settings)
        // Mapgen
        settings->setDefault("mg_name", "v7");
        settings->setDefault("water_level", "1");
-       settings->setDefault("mapgen_limit", "31000");
+       settings->setDefault("mapgen_limit", "31007");
        settings->setDefault("chunksize", "5");
-       settings->setDefault("mg_flags", "dungeons");
        settings->setDefault("fixed_map_seed", "");
-       settings->setDefault("max_block_generate_distance", "7");
-       settings->setDefault("projecting_dungeons", "true");
+       settings->setDefault("max_block_generate_distance", "10");
        settings->setDefault("enable_mapgen_debug_info", "false");
+       Mapgen::setDefaultSettings(settings);
 
        // Server list announcing
        settings->setDefault("server_announce", "false");
@@ -396,57 +449,65 @@ void set_default_settings(Settings *settings)
        settings->setDefault("server_name", "");
        settings->setDefault("server_description", "");
 
-       settings->setDefault("high_precision_fpu", "true");
        settings->setDefault("enable_console", "false");
+       settings->setDefault("screen_dpi", "72");
+       settings->setDefault("display_density_factor", "1");
 
+       // Altered settings for macOS
+#if defined(__MACH__) && defined(__APPLE__)
+       settings->setDefault("keymap_sneak", "KEY_SHIFT");
+#endif
+
+#ifdef HAVE_TOUCHSCREENGUI
+       settings->setDefault("touchtarget", "true");
+       settings->setDefault("touchscreen_threshold","20");
+       settings->setDefault("fixed_virtual_joystick", "false");
+       settings->setDefault("virtual_joystick_triggers_aux1", "false");
+       settings->setDefault("clickable_chat_weblinks", "false");
+#else
+       settings->setDefault("clickable_chat_weblinks", "true");
+#endif
+       // Altered settings for Android
 #ifdef __ANDROID__
        settings->setDefault("screen_w", "0");
        settings->setDefault("screen_h", "0");
-       settings->setDefault("enable_shaders", "false");
        settings->setDefault("fullscreen", "true");
-       settings->setDefault("video_driver", "ogles1");
-       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("performance_tradeoffs", "true");
+       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("fps_max_unfocused", "10");
        settings->setDefault("sqlite_synchronous", "1");
-       settings->setDefault("gui_scaling", "1.1");
+       settings->setDefault("map_compression_level_disk", "-1");
+       settings->setDefault("map_compression_level_net", "-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("client_mapblock_limit", "1000");
+       settings->setDefault("active_block_range", "2");
+       settings->setDefault("viewing_range", "50");
+       settings->setDefault("leaves_style", "simple");
+       settings->setDefault("curl_verify_cert","false");
 
-       settings->setDefault("viewing_range", "25");
-       settings->setDefault("inventory_image_hack", "false");
+       // Apply settings according to screen size
+       float x_inches = (float) porting::getDisplaySize().X /
+                       (160.f * porting::getDisplayDensity());
 
-       // Check for a device with a small screen
-       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");
-#else
-       settings->setDefault("screen_dpi", "72");
+       // Tablets >= 6.0 use non-Android defaults for these settings
 #endif
 }
-
-void override_default_settings(Settings *settings, Settings *from)
-{
-       std::vector<std::string> names = from->getNames();
-       for (const auto &name : names) {
-               settings->setDefault(name, from->get(name));
-       }
-}