Merge remote branch 'origin/master'

[minetest.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index d824d292387542a50975819f13babc54a469b2ce..7afe8df051bf8ed2df8780422ceffdd60b96cae3 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -18,6 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "settings.h"
+#include "filesys.h"
 
 void set_default_settings(Settings *settings)
 {
@@ -56,6 +57,8 @@ void set_default_settings(Settings *settings)
        settings->setDefault("anaglyph", "false");
        settings->setDefault("anaglyph_strength", "0.1");
        settings->setDefault("aux1_descends", "false");
+       settings->setDefault("doubletap_jump", "false");
+       settings->setDefault("always_fly_fast", "true");
 
        // Some (temporary) keys for debugging
        settings->setDefault("keymap_print_debug_stacks", "KEY_KEY_P");
@@ -105,9 +108,13 @@ void set_default_settings(Settings *settings)
        settings->setDefault("screenshot_path", ".");
        settings->setDefault("view_bobbing_amount", "1.0");
        settings->setDefault("enable_3d_clouds", "true");
+       settings->setDefault("cloud_height", "120");
        settings->setDefault("opaque_water", "false");
        settings->setDefault("console_color", "(0,0,0)");
        settings->setDefault("console_alpha", "200");
+       settings->setDefault("selectionbox_color", "(0,0,0)");
+       settings->setDefault("crosshair_color", "(255,255,255)");
+       settings->setDefault("crosshair_alpha", "255");
        settings->setDefault("enable_sound", "true");
        settings->setDefault("sound_volume", "0.8");
        settings->setDefault("desynchronize_mapblock_texture_animation", "true");
@@ -118,6 +125,23 @@ void set_default_settings(Settings *settings)
        settings->setDefault("trilinear_filter", "false");
        settings->setDefault("preload_item_visuals", "true");
        settings->setDefault("enable_shaders", "2");
+       settings->setDefault("repeat_rightclick_time", "0.25");
+       settings->setDefault("enable_particles", "true");
+
+       settings->setDefault("media_fetch_threads", "8");
+
+       settings->setDefault("serverlist_url", "servers.minetest.net");
+       settings->setDefault("serverlist_file", "favoriteservers.txt");
+       settings->setDefault("server_announce", "false");
+       settings->setDefault("server_url", "");
+       settings->setDefault("server_address", "");
+       settings->setDefault("server_name", "");
+       settings->setDefault("server_description", "");
+
+       settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "liberationsans.ttf"));
+       settings->setDefault("font_size", "13");
+       settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "liberationmono.ttf"));
+       settings->setDefault("mono_font_size", "13");
 
        // Server stuff
        // "map-dir" doesn't exist by default.
@@ -158,5 +182,53 @@ void set_default_settings(Settings *settings)
        settings->setDefault("congestion_control_aim_rtt", "0.2");
        settings->setDefault("congestion_control_max_rate", "400");
        settings->setDefault("congestion_control_min_rate", "10");
+       settings->setDefault("remote_media", "");
+       settings->setDefault("debug_log_level", "0");
+       settings->setDefault("emergequeue_limit_total", "256");
+       settings->setDefault("emergequeue_limit_diskonly", "");
+       settings->setDefault("emergequeue_limit_generate", "");
+       settings->setDefault("num_emerge_threads", "1");
+       
+       // physics stuff
+       settings->setDefault("movement_acceleration_default", "3");
+       settings->setDefault("movement_acceleration_air", "2");
+       settings->setDefault("movement_acceleration_fast", "10");
+       settings->setDefault("movement_speed_walk", "4");
+       settings->setDefault("movement_speed_crouch", "1.35");
+       settings->setDefault("movement_speed_fast", "20");
+       settings->setDefault("movement_speed_climb", "2");
+       settings->setDefault("movement_speed_jump", "6.5");
+       settings->setDefault("movement_liquid_fluidity", "1");
+       settings->setDefault("movement_liquid_fluidity_smooth", "0.5");
+       settings->setDefault("movement_liquid_sink", "10");
+       settings->setDefault("movement_gravity", "9.81");
+       
+       //mapgen related things
+       settings->setDefault("mg_name", "v6");
+       settings->setDefault("water_level", "1");
+       settings->setDefault("liquid_finite", "false");
+       settings->setDefault("liquid_update", "1.0");
+       settings->setDefault("liquid_relax", "1");
+       settings->setDefault("liquid_fast_flood", "1");
+       
+       settings->setDefault("chunksize", "5");
+       settings->setDefault("mg_flags", "trees, caves, v6_biome_blend");
+       settings->setDefault("mgv6_freq_desert", "0.45");
+       settings->setDefault("mgv6_freq_beach", "0.15");
+
+       settings->setDefault("mgv6_np_terrain_base",   "-4, 20, (250.0, 250, 250), 82341, 5, 0.6");
+       settings->setDefault("mgv6_np_terrain_higher", "20, 16, (500, 500, 500), 85039, 5, 0.6");
+       settings->setDefault("mgv6_np_steepness",      "0.85, 0.5, (125, 125, 125), -932, 5, 0.7");
+       settings->setDefault("mgv6_np_height_select",  "0.5, 1, (250, 250, 250), 4213, 5, 0.69");
+       settings->setDefault("mgv6_np_trees",          "0, 1, (125, 125, 125), 2, 4, 0.66");
+       settings->setDefault("mgv6_np_mud",            "4, 2, (200, 200, 200), 91013, 3, 0.55");
+       settings->setDefault("mgv6_np_beach",          "0, 1, (250, 250, 250), 59420, 3, 0.50");
+       settings->setDefault("mgv6_np_biome",          "0, 1, (250, 250, 250), 9130, 3, 0.50");
+       settings->setDefault("mgv6_np_cave",           "6, 6, (250, 250, 250), 34329, 3, 0.50");
+
+       settings->setDefault("mgv7_np_terrain",  "10, 12, (350, 350, 350), 82341, 5, 0.6");
+       settings->setDefault("mgv7_np_bgroup",   "0.5, 0.3125, (350, 350, 350), 5923, 2, 0.6");
+       settings->setDefault("mgv7_np_heat",     "25, 50, (500, 500, 500), 35293, 1, 0");
+       settings->setDefault("mgv7_np_humidity", "50, 31.25, (750, 750, 750), 12094, 2, 0.6");
 }