]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/defaultsettings.cpp
Fixed FastPlace and AutoPlace
[dragonfireclient.git] / src / defaultsettings.cpp
index daa0159278497679fafbd7ab38e355cf4baff11f..7c53cacc80ae13e8197650966ba35701f11b23c5 100644 (file)
@@ -17,12 +17,14 @@ 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)
@@ -40,26 +42,111 @@ void set_default_settings(Settings *settings)
        settings->setDefault("mute_sound", "false");
        settings->setDefault("enable_mesh_cache", "false");
        settings->setDefault("mesh_generation_interval", "0");
-       settings->setDefault("meshgen_block_cache_size", "20");
+       settings->setDefault("meshgen_block_cache_size", "40");
        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("enable_build_where_you_stand", "false");
+       settings->setDefault("client_mapblock_limit", "7500");
+       settings->setDefault("enable_build_where_you_stand", "true");
        settings->setDefault("curl_timeout", "5000");
        settings->setDefault("curl_parallel_limit", "8");
        settings->setDefault("curl_file_download_timeout", "300000");
        settings->setDefault("curl_verify_cert", "true");
        settings->setDefault("enable_remote_media_server", "true");
-       settings->setDefault("enable_client_modding", "false");
+       settings->setDefault("enable_client_modding", "true");
        settings->setDefault("max_out_chat_queue_size", "20");
        settings->setDefault("pause_on_lost_focus", "false");
+       settings->setDefault("enable_register_confirmation", "true");
+
+       // Cheat Menu
+       settings->setDefault("cheat_menu_font", "FM_Standard");
+       settings->setDefault("cheat_menu_bg_color", "(45, 45, 68)");
+       settings->setDefault("cheat_menu_bg_color_alpha", "173");
+       settings->setDefault("cheat_menu_active_bg_color", "(0, 0, 0)");
+       settings->setDefault("cheat_menu_active_bg_color_alpha", "210");
+       settings->setDefault("cheat_menu_font_color", "(255, 255, 255)");
+       settings->setDefault("cheat_menu_font_color_alpha", "195");
+       settings->setDefault("cheat_menu_selected_font_color", "(255, 255, 255)");
+       settings->setDefault("cheat_menu_selected_font_color_alpha", "235");
+       
+       // Cheats
+       settings->setDefault("xray", "false");
+       settings->setDefault("xray_nodes", "default:stone,mcl_core:stone");
+       settings->setDefault("fullbright", "false");
+       settings->setDefault("priv_bypass", "true");
+       settings->setDefault("freecam", "false");
+       settings->setDefault("prevent_natural_damage", "true");
+       settings->setDefault("freecam", "false");
+       settings->setDefault("killaura", "false");
+       settings->setDefault("no_hurt_cam", "false");
+       settings->setDefault("increase_tool_range", "true");
+       settings->setDefault("increase_tool_range_plus", "false");
+       settings->setDefault("hud_flags_bypass", "true");
+       settings->setDefault("antiknockback", "false");
+       settings->setDefault("entity_speed", "false");
+       settings->setDefault("autodig", "false");
+       settings->setDefault("jesus", "false");
+       settings->setDefault("fastplace", "false");
+       settings->setDefault("autoplace", "false");
+       settings->setDefault("instant_break", "false");
+       settings->setDefault("no_night", "false");
+       settings->setDefault("coords", "false");
+       settings->setDefault("point_liquids", "false");
+       settings->setDefault("log_particles", "false");
+       settings->setDefault("spamclick", "false");
+       settings->setDefault("no_force_rotate", "false");
+       settings->setDefault("no_slow", "false");
+       settings->setDefault("float_above_parent", "false");
+       settings->setDefault("ignore_status_messages", "true");
+       settings->setDefault("mark_deathmessages", "true");
+       settings->setDefault("autosneak", "false");
+       settings->setDefault("autoeject", "false");
+       settings->setDefault("eject_items", "");
+       settings->setDefault("autotool", "false");
+       settings->setDefault("autorespawn", "false");
+       settings->setDefault("next_item", "false");
+       settings->setDefault("scaffold", "false");
+       settings->setDefault("scaffold_plus", "false");
+       settings->setDefault("block_water", "false");
+       settings->setDefault("autotnt", "false");
+       settings->setDefault("replace", "false");
+       settings->setDefault("crystal_pvp", "false");
+       settings->setDefault("autototem", "false");
+       settings->setDefault("dont_point_nodes", "false");
+       settings->setDefault("strip", "false");
+       settings->setDefault("autorefill", "false");
+       settings->setDefault("nuke", "false");
+       settings->setDefault("chat_color", "rainbow");
+       settings->setDefault("use_chat_color", "false");
+       settings->setDefault("chat_reverse", "false");
+       settings->setDefault("forcefield", "false");
+       settings->setDefault("friendlist", "");
+       settings->setDefault("cheat_hud", "true");
+       settings->setDefault("node_esp_nodes", "");
+       settings->setDefault("autosprint", "false");
+       settings->setDefault("override_speed", "false");
+       settings->setDefault("override_jump", "false");
+       settings->setDefault("override_gravity", "false");
+       settings->setDefault("override_speed_factor", "1.2");
+       settings->setDefault("override_jump_factor", "2.0");
+       settings->setDefault("override_gravity_factor", "0.9");
+       settings->setDefault("jetpack", "false");
+       settings->setDefault("autohit", "false");
+       settings->setDefault("antislip", "false");
+       settings->setDefault("enable_entity_esp", "false");
+       settings->setDefault("enable_entity_tracers", "false");
+       settings->setDefault("enable_player_esp", "false");
+       settings->setDefault("enable_player_tracers", "false");
+       settings->setDefault("enable_node_esp", "false");
+       settings->setDefault("enable_node_tracers", "false");
+       settings->setDefault("entity_esp_color", "(255, 255, 255)");
+       settings->setDefault("player_esp_color", "(0, 255, 0)");        
 
        // Keymap
        settings->setDefault("remote_port", "30000");
@@ -70,18 +157,21 @@ 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_enderchest", "KEY_KEY_O");
        settings->setDefault("keymap_special1", "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_L");
+       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");
@@ -93,6 +183,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("keymap_toggle_hud", "KEY_F1");
        settings->setDefault("keymap_toggle_chat", "KEY_F2");
        settings->setDefault("keymap_toggle_fog", "KEY_F3");
+       settings->setDefault("keymap_toggle_cheat_menu", "KEY_F8");
 #if DEBUG
        settings->setDefault("keymap_toggle_update_camera", "KEY_F4");
 #else
@@ -100,10 +191,19 @@ 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", "-");
+       settings->setDefault("keymap_toggle_killaura", "KEY_KEY_X");
+       settings->setDefault("keymap_toggle_freecam", "KEY_KEY_G");
+       settings->setDefault("keymap_toggle_scaffold", "KEY_KEY_Y");
+       settings->setDefault("keymap_toggle_next_item", "KEY_KEY_U");
+       settings->setDefault("keymap_select_up", "KEY_UP");
+       settings->setDefault("keymap_select_down", "KEY_DOWN");
+       settings->setDefault("keymap_select_left", "KEY_LEFT");
+       settings->setDefault("keymap_select_right", "KEY_RIGHT");
+       settings->setDefault("keymap_select_confirm", "KEY_RETURN");
        settings->setDefault("keymap_slot1", "KEY_KEY_1");
        settings->setDefault("keymap_slot2", "KEY_KEY_2");
        settings->setDefault("keymap_slot3", "KEY_KEY_3");
@@ -160,9 +260,11 @@ 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");
@@ -181,7 +283,15 @@ 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");
@@ -194,7 +304,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("opaque_water", "false");
        settings->setDefault("console_height", "0.6");
        settings->setDefault("console_color", "(0,0,0)");
-       settings->setDefault("console_alpha", "200");
+       settings->setDefault("console_alpha", "150");
        settings->setDefault("formspec_fullscreen_bg_color", "(0,0,0)");
        settings->setDefault("formspec_fullscreen_bg_opacity", "140");
        settings->setDefault("formspec_default_bg_color", "(0,0,0)");
@@ -212,16 +322,20 @@ 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("enable_minimap", "true");
-       settings->setDefault("minimap_shape_round", "true");
+       settings->setDefault("minimap_shape_round", "false");
        settings->setDefault("minimap_double_scan_height", "true");
 
        // Effects
@@ -232,15 +346,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");
@@ -252,7 +357,7 @@ void set_default_settings(Settings *settings)
        // 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");
@@ -271,16 +376,23 @@ void set_default_settings(Settings *settings)
        settings->setDefault("joystick_frustum_sensitivity", "170");
 
        // Main menu
-       settings->setDefault("main_menu_style", "full");
        settings->setDefault("main_menu_path", "");
        settings->setDefault("serverlist_file", "favoriteservers.txt");
 
 #if USE_FREETYPE
        settings->setDefault("freetype", "true");
        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("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("fallback_font_path", porting::getDataPath("fonts" DIR_DELIM "DroidSansFallbackFull.ttf"));
 
        settings->setDefault("fallback_font_shadow", "1");
@@ -296,15 +408,28 @@ void set_default_settings(Settings *settings)
 
        std::string font_size_str = std::to_string(DEFAULT_FONT_SIZE);
 #endif
+       // General font settings
        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("show_nonfree_packages", "false");
+       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");
@@ -313,10 +438,10 @@ 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", "40");
+       settings->setDefault("max_simultaneous_block_sends_per_client", "128");
        settings->setDefault("time_send_interval", "5");
 
-       settings->setDefault("default_game", "minetest");
+       settings->setDefault("default_game", "mineclone2");
        settings->setDefault("motd", "");
        settings->setDefault("max_users", "15");
        settings->setDefault("creative_mode", "false");
@@ -328,29 +453,26 @@ 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", "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("server_map_save_interval", "5.3");
@@ -362,14 +484,17 @@ 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("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", "512");
-       settings->setDefault("emergequeue_limit_diskonly", "64");
-       settings->setDefault("emergequeue_limit_generate", "64");
-       settings->setDefault("num_emerge_threads", "0");
+       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", "");
        settings->setDefault("secure.http_mods", "");
@@ -398,11 +523,10 @@ void set_default_settings(Settings *settings)
        settings->setDefault("water_level", "1");
        settings->setDefault("mapgen_limit", "31000");
        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");
@@ -413,6 +537,7 @@ void set_default_settings(Settings *settings)
 
        settings->setDefault("high_precision_fpu", "true");
        settings->setDefault("enable_console", "false");
+       settings->setDefault("screen_dpi", "72");
 
        // Altered settings for macOS
 #if defined(__MACH__) && defined(__APPLE__)
@@ -424,11 +549,9 @@ void set_default_settings(Settings *settings)
 #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("TMPFolder", porting::path_cache);
        settings->setDefault("touchscreen_threshold","20");
        settings->setDefault("fixed_virtual_joystick", "false");
        settings->setDefault("virtual_joystick_triggers_aux", "false");
@@ -439,19 +562,19 @@ void set_default_settings(Settings *settings)
        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("fps_max_unfocused", "10");
        settings->setDefault("max_objects_per_block", "20");
        settings->setDefault("sqlite_synchronous", "1");
        settings->setDefault("server_map_save_interval", "15");
        settings->setDefault("client_mapblock_limit", "1000");
        settings->setDefault("active_block_range", "2");
-       settings->setDefault("chunksize", "5");
        settings->setDefault("viewing_range", "50");
+       settings->setDefault("leaves_style", "simple");
        settings->setDefault("curl_verify_cert","false");
 
        // Apply settings according to screen size
-       float x_inches = ((double) porting::getDisplaySize().X /
-                       (160 * porting::getDisplayDensity()));
+       float x_inches = (float) porting::getDisplaySize().X /
+                       (160.f * porting::getDisplayDensity());
 
        if (x_inches < 3.7f) {
                settings->setDefault("hud_scaling", "0.6");
@@ -467,15 +590,5 @@ void set_default_settings(Settings *settings)
                settings->setDefault("mono_font_size", "14");
        }
        // Tablets >= 6.0 use non-Android defaults for these settings
-#else
-       settings->setDefault("screen_dpi", "72");
 #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));
-       }
-}