Merge pull request #284 from RealBadAngel/master

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

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 67f2e4055805b7ca383d57d55d4c532dd35ebf58..6eaa284101f37b176410379145cc4292f2751d68 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -3,16 +3,16 @@ Minetest-c55
 Copyright (C) 2010 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 General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -25,7 +25,6 @@ void set_default_settings(Settings *settings)
 
        settings->setDefault("port", "");
        settings->setDefault("name", "");
-       settings->setDefault("footprints", "false");
 
        // Client stuff
 
@@ -53,6 +52,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("keymap_toggle_profiler", "KEY_F6");
        settings->setDefault("keymap_increase_viewing_range_min", "+");
        settings->setDefault("keymap_decrease_viewing_range_min", "-");
+       settings->setDefault("aux1_descends", "false");
        // Some (temporary) keys for debugging
        settings->setDefault("keymap_print_debug_stacks", "KEY_KEY_P");
        settings->setDefault("keymap_quicktune_prev", "KEY_HOME");
@@ -74,6 +74,10 @@ void set_default_settings(Settings *settings)
        settings->setDefault("viewing_range_nodes_min", "35");
        settings->setDefault("screenW", "800");
        settings->setDefault("screenH", "600");
+       settings->setDefault("fullscreen", "false");
+       settings->setDefault("fullscreen_bpp", "24");
+       settings->setDefault("fsaa", "0");
+       settings->setDefault("vsync", "false");
        settings->setDefault("address", "");
        settings->setDefault("random_input", "false");
        settings->setDefault("client_unload_unused_data_timeout", "600");
@@ -100,6 +104,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("console_alpha", "200");
        settings->setDefault("enable_sound", "true");
        settings->setDefault("sound_volume", "0.8");
+       settings->setDefault("desynchronize_mapblock_texture_animation", "true");
 
        // Server stuff
        // "map-dir" doesn't exist by default.
@@ -116,6 +121,9 @@ void set_default_settings(Settings *settings)
        settings->setDefault("default_privs", "interact, shout");
        settings->setDefault("unlimited_player_transfer_distance", "true");
        settings->setDefault("enable_pvp", "true");
+       settings->setDefault("disallow_empty_password", "false");
+       settings->setDefault("disable_anticheat", "false");
+       settings->setDefault("enable_rollback_recording", "false");
 
        settings->setDefault("profiler_print_interval", "0");
        settings->setDefault("enable_mapgen_debug_info", "false");
@@ -133,5 +141,11 @@ void set_default_settings(Settings *settings)
        settings->setDefault("server_map_save_interval", "5.3");
        settings->setDefault("full_block_send_enable_min_time_from_building", "2.0");
        settings->setDefault("dedicated_server_step", "0.05");
+       settings->setDefault("ignore_world_load_errors", "false");
+       settings->setDefault("mip_map", "false");
+       settings->setDefault("anisotropic_filter", "false");
+       settings->setDefault("bilinear_filter", "false");
+       settings->setDefault("trilinear_filter", "false");
+
 }