diff options
| author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-30 19:46:55 +0200 |
|---|---|---|
| committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-30 19:47:55 +0200 |
| commit | 96bee29e35f0790657fbd8bb67d2af79b498255c (patch) | |
| tree | 0712c75629ab16fad84af11050ef94d8c8ac8137 /src/defaultsettings.cpp | |
| parent | 82ea53499710c9a4e92ec595d8c14c417bdd0ee6 (diff) | |
| parent | f2051c98223d087c8ba3d7e4514935781c93ed1c (diff) | |
| download | minetest-96bee29e35f0790657fbd8bb67d2af79b498255c.tar.gz minetest-96bee29e35f0790657fbd8bb67d2af79b498255c.tar.bz2 minetest-96bee29e35f0790657fbd8bb67d2af79b498255c.zip | |
Merge branch 'upstream/master'
Diffstat (limited to 'src/defaultsettings.cpp')
| -rw-r--r-- | src/defaultsettings.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 8326a0f0d..c1104eff0 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -77,9 +77,10 @@ void set_default_settings() g_settings.setDefault("screenshot_path", "."); // Server stuff + g_settings.setDefault("motd", "<Message of the day (motd) not set>"); g_settings.setDefault("enable_experimental", "false"); g_settings.setDefault("creative_mode", "false"); - g_settings.setDefault("enable_damage", "false"); //TODO: Set to true when healing is possible + g_settings.setDefault("enable_damage", "true"); g_settings.setDefault("give_initial_stuff", "false"); g_settings.setDefault("default_password", ""); g_settings.setDefault("default_privs", "build, shout"); |