X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fdefaultsettings.cpp;h=5a56f3d770d4b101a1ced012ec5b11373405d9c0;hb=38f6e7a1981a8dcba9bfa9aa32ca77cd19a960aa;hp=3f4ce6337ac37b1c13a442d877a1dc981a4a8bab;hpb=bce0d458d8cda70c10d78ea9ec476474f0a6f01a;p=oweals%2Fminetest.git diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 3f4ce6337..5a56f3d77 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -37,10 +37,13 @@ void set_default_settings(Settings *settings) settings->setDefault("address", ""); settings->setDefault("enable_sound", "true"); settings->setDefault("sound_volume", "0.8"); + 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("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", "."); @@ -48,19 +51,21 @@ void set_default_settings(Settings *settings) 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("send_pre_v25_init", "false"); + settings->setDefault("enable_build_where_you_stand", "false"); 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("max_out_chat_queue_size", "20"); + settings->setDefault("pause_on_lost_focus", "false"); + settings->setDefault("enable_register_confirmation", "true"); // Keymap settings->setDefault("remote_port", "30000"); settings->setDefault("keymap_forward", "KEY_KEY_W"); - settings->setDefault("keymap_autorun", ""); + settings->setDefault("keymap_autoforward", ""); settings->setDefault("keymap_backward", "KEY_KEY_S"); settings->setDefault("keymap_left", "KEY_KEY_A"); settings->setDefault("keymap_right", "KEY_KEY_D"); @@ -77,12 +82,18 @@ void set_default_settings(Settings *settings) 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_fastmove", "KEY_KEY_J"); settings->setDefault("keymap_noclip", "KEY_KEY_H"); + settings->setDefault("keymap_hotbar_next", "KEY_KEY_N"); + settings->setDefault("keymap_hotbar_previous", "KEY_KEY_B"); + settings->setDefault("keymap_mute", "KEY_KEY_M"); + settings->setDefault("keymap_increase_volume", ""); + settings->setDefault("keymap_decrease_volume", ""); 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 @@ -94,8 +105,40 @@ void set_default_settings(Settings *settings) settings->setDefault("keymap_screenshot", "KEY_F12"); settings->setDefault("keymap_increase_viewing_range_min", "+"); settings->setDefault("keymap_decrease_viewing_range_min", "-"); + settings->setDefault("keymap_slot1", "KEY_KEY_1"); + settings->setDefault("keymap_slot2", "KEY_KEY_2"); + settings->setDefault("keymap_slot3", "KEY_KEY_3"); + settings->setDefault("keymap_slot4", "KEY_KEY_4"); + settings->setDefault("keymap_slot5", "KEY_KEY_5"); + settings->setDefault("keymap_slot6", "KEY_KEY_6"); + settings->setDefault("keymap_slot7", "KEY_KEY_7"); + settings->setDefault("keymap_slot8", "KEY_KEY_8"); + settings->setDefault("keymap_slot9", "KEY_KEY_9"); + settings->setDefault("keymap_slot10", "KEY_KEY_0"); + settings->setDefault("keymap_slot11", ""); + settings->setDefault("keymap_slot12", ""); + settings->setDefault("keymap_slot13", ""); + settings->setDefault("keymap_slot14", ""); + settings->setDefault("keymap_slot15", ""); + settings->setDefault("keymap_slot16", ""); + settings->setDefault("keymap_slot17", ""); + settings->setDefault("keymap_slot18", ""); + settings->setDefault("keymap_slot19", ""); + settings->setDefault("keymap_slot20", ""); + 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_print_debug_stacks", "KEY_KEY_P"); settings->setDefault("keymap_quicktune_prev", "KEY_HOME"); settings->setDefault("keymap_quicktune_next", "KEY_END"); settings->setDefault("keymap_quicktune_dec", "KEY_NEXT"); @@ -108,17 +151,22 @@ void set_default_settings(Settings *settings) settings->setDefault("show_debug", "true"); #endif settings->setDefault("fsaa", "0"); + settings->setDefault("undersampling", "0"); + settings->setDefault("world_aligned_mode", "enable"); + settings->setDefault("autoscale_mode", "disable"); settings->setDefault("enable_fog", "true"); settings->setDefault("fog_start", "0.4"); settings->setDefault("3d_mode", "none"); settings->setDefault("3d_paralax_strength", "0.025"); settings->setDefault("tooltip_show_delay", "400"); - settings->setDefault("zoom_fov", "15"); + settings->setDefault("tooltip_append_itemname", "false"); settings->setDefault("fps_max", "60"); settings->setDefault("pause_fps_max", "20"); settings->setDefault("viewing_range", "100"); - settings->setDefault("screenW", "800"); - settings->setDefault("screenH", "600"); + settings->setDefault("near_plane", "0.1"); + 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"); @@ -126,7 +174,12 @@ void set_default_settings(Settings *settings) settings->setDefault("leaves_style", "fancy"); settings->setDefault("connected_glass", "false"); settings->setDefault("smooth_lighting", "true"); - settings->setDefault("display_gamma", "2.2"); + settings->setDefault("lighting_alpha", "0.0"); + settings->setDefault("lighting_beta", "1.5"); + settings->setDefault("display_gamma", "1.0"); + settings->setDefault("lighting_boost", "0.2"); + settings->setDefault("lighting_boost_center", "0.5"); + settings->setDefault("lighting_boost_spread", "0.2"); settings->setDefault("texture_path", ""); settings->setDefault("shader_path", ""); settings->setDefault("video_driver", "opengl"); @@ -135,20 +188,24 @@ 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_height", "120"); settings->setDefault("cloud_radius", "12"); settings->setDefault("menu_clouds", "true"); settings->setDefault("opaque_water", "false"); - settings->setDefault("console_height", "1.0"); + settings->setDefault("console_height", "0.6"); settings->setDefault("console_color", "(0,0,0)"); settings->setDefault("console_alpha", "200"); + 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)"); + settings->setDefault("formspec_default_bg_opacity", "140"); settings->setDefault("selectionbox_color", "(0,0,0)"); settings->setDefault("selectionbox_width", "2"); settings->setDefault("node_highlighting", "box"); settings->setDefault("crosshair_color", "(255,255,255)"); settings->setDefault("crosshair_alpha", "255"); + settings->setDefault("recent_chat_messages", "6"); settings->setDefault("hud_scaling", "1.0"); settings->setDefault("gui_scaling", "1.0"); settings->setDefault("gui_scaling_filter", "false"); @@ -162,6 +219,7 @@ void set_default_settings(Settings *settings) settings->setDefault("ambient_occlusion_gamma", "2.2"); settings->setDefault("enable_shaders", "true"); settings->setDefault("enable_particles", "true"); + settings->setDefault("arm_inertia", "true"); settings->setDefault("enable_minimap", "true"); settings->setDefault("minimap_shape_round", "true"); @@ -169,7 +227,6 @@ void set_default_settings(Settings *settings) // Effects settings->setDefault("directional_colored_fog", "true"); - settings->setDefault("view_bobbing", "true"); settings->setDefault("inventory_items_animations", "false"); settings->setDefault("mip_map", "false"); settings->setDefault("anisotropic_filter", "false"); @@ -197,10 +254,16 @@ void set_default_settings(Settings *settings) settings->setDefault("invert_mouse", "false"); settings->setDefault("mouse_sensitivity", "0.2"); settings->setDefault("repeat_rightclick_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 __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"); @@ -209,12 +272,8 @@ 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("main_menu_mod_mgr", "1"); - settings->setDefault("main_menu_game_mgr", "0"); - settings->setDefault("modstore_download_url", "https://forum.minetest.net/media/"); - settings->setDefault("modstore_listmods_url", "https://forum.minetest.net/mmdb/mods/"); - settings->setDefault("modstore_details_url", "https://forum.minetest.net/mmdb/mod/*/"); settings->setDefault("serverlist_file", "favoriteservers.txt"); #if USE_FREETYPE @@ -240,33 +299,37 @@ 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"); +#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"); // Network settings->setDefault("enable_ipv6", "true"); settings->setDefault("ipv6_server", "false"); - settings->setDefault("workaround_window_size","5"); settings->setDefault("max_packets_per_iteration","1024"); 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_server_total", "40"); + 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("give_initial_stuff", "false"); settings->setDefault("default_password", ""); settings->setDefault("default_privs", "interact, shout"); settings->setDefault("enable_pvp", "true"); + settings->setDefault("enable_mod_channels", "false"); settings->setDefault("disallow_empty_password", "false"); settings->setDefault("disable_anticheat", "false"); settings->setDefault("enable_rollback_recording", "false"); @@ -281,15 +344,18 @@ void set_default_settings(Settings *settings) settings->setDefault("ask_reconnect_on_crash", "false"); settings->setDefault("profiler_print_interval", "0"); - settings->setDefault("active_object_send_range_blocks", "3"); + settings->setDefault("active_object_send_range_blocks", "4"); settings->setDefault("active_block_range", "3"); //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", "10"); 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("server_unload_unused_data_timeout", "29"); settings->setDefault("max_objects_per_block", "64"); settings->setDefault("server_map_save_interval", "5.3"); @@ -298,16 +364,16 @@ void set_default_settings(Settings *settings) settings->setDefault("chat_message_limit_trigger_kick", "50"); settings->setDefault("sqlite_synchronous", "2"); settings->setDefault("full_block_send_enable_min_time_from_building", "2.0"); - settings->setDefault("dedicated_server_step", "0.1"); + settings->setDefault("dedicated_server_step", "0.09"); settings->setDefault("active_block_mgmt_interval", "2.0"); settings->setDefault("abm_interval", "1.0"); 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("emergequeue_limit_total", "512"); + settings->setDefault("emergequeue_limit_diskonly", "64"); + settings->setDefault("emergequeue_limit_generate", "64"); settings->setDefault("num_emerge_threads", "1"); settings->setDefault("secure.enable_security", "true"); settings->setDefault("secure.trusted_mods", ""); @@ -339,7 +405,8 @@ void set_default_settings(Settings *settings) settings->setDefault("chunksize", "5"); settings->setDefault("mg_flags", "dungeons"); settings->setDefault("fixed_map_seed", ""); - settings->setDefault("max_block_generate_distance", "7"); + settings->setDefault("max_block_generate_distance", "8"); + settings->setDefault("projecting_dungeons", "true"); settings->setDefault("enable_mapgen_debug_info", "false"); // Server list announcing @@ -350,44 +417,61 @@ void set_default_settings(Settings *settings) settings->setDefault("server_description", ""); settings->setDefault("high_precision_fpu", "true"); + settings->setDefault("enable_console", "false"); + // Altered settings for macOS +#if defined(__MACH__) && defined(__APPLE__) + settings->setDefault("keymap_sneak", "KEY_SHIFT"); + settings->setDefault("fps_max", "0"); +#endif + + // Altered settings for Android #ifdef __ANDROID__ - settings->setDefault("screenW", "0"); - settings->setDefault("screenH", "0"); + 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("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 @@ -396,8 +480,7 @@ void set_default_settings(Settings *settings) void override_default_settings(Settings *settings, Settings *from) { std::vector names = from->getNames(); - for (size_t i = 0; i < names.size(); i++) { - const std::string &name = names[i]; + for (const auto &name : names) { settings->setDefault(name, from->get(name)); } }