Noise: Prevent unittest crash caused by division by zero

[oweals/minetest.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 52ff4c068a237958749425effbd1f2b9624fda15..9785b5f5be60031d068630ba9dba06a739ece969 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -39,6 +39,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("sound_volume", "0.8");
        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("fast_move", "false");
@@ -56,11 +57,12 @@ void set_default_settings(Settings *settings)
        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");
 
        // 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");
@@ -79,6 +81,11 @@ void set_default_settings(Settings *settings)
        settings->setDefault("keymap_freemove", "KEY_KEY_K");
        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");
@@ -108,6 +115,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("show_debug", "true");
 #endif
        settings->setDefault("fsaa", "0");
+       settings->setDefault("undersampling", "0");
        settings->setDefault("enable_fog", "true");
        settings->setDefault("fog_start", "0.4");
        settings->setDefault("3d_mode", "none");
@@ -117,8 +125,9 @@ void set_default_settings(Settings *settings)
        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("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");
@@ -162,6 +171,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 +179,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");
@@ -212,9 +221,6 @@ void set_default_settings(Settings *settings)
        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
@@ -244,6 +250,7 @@ void set_default_settings(Settings *settings)
 
        // Server
        settings->setDefault("disable_escape_sequences", "false");
+       settings->setDefault("strip_color_codes", "false");
 
        // Network
        settings->setDefault("enable_ipv6", "true");
@@ -263,7 +270,6 @@ void set_default_settings(Settings *settings)
        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");
@@ -288,6 +294,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", "3");
+       settings->setDefault("csm_flavour_noderange_limit", "8");
        settings->setDefault("max_clearobjects_extra_loaded_blocks", "4096");
        settings->setDefault("time_speed", "72");
        settings->setDefault("server_unload_unused_data_timeout", "29");
@@ -340,6 +348,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("mg_flags", "dungeons");
        settings->setDefault("fixed_map_seed", "");
        settings->setDefault("max_block_generate_distance", "7");
+       settings->setDefault("projecting_dungeons", "true");
        settings->setDefault("enable_mapgen_debug_info", "false");
 
        // Server list announcing
@@ -353,8 +362,8 @@ void set_default_settings(Settings *settings)
        settings->setDefault("enable_console", "false");
 
 #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");