Merge remote branch 'origin/master'

[minetest.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index e3c6b2f7d7f2dd073602dd0b2df1729cce45ce18..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
@@ -130,8 +130,13 @@ void set_default_settings(Settings *settings)
 
        settings->setDefault("media_fetch_threads", "8");
 
-       settings->setDefault("serverlist_url", "servers.minetest.ru/server.list");
+       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");
@@ -178,7 +183,12 @@ void set_default_settings(Settings *settings)
        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");
@@ -196,6 +206,11 @@ void set_default_settings(Settings *settings)
        //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");