diff options
author | Perttu Ahola <celeron55@gmail.com> | 2013-03-21 21:42:23 +0200 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2013-03-21 22:22:15 +0200 |
commit | c2250d95c4da368d1535794a1c7f2092ce479d7a (patch) | |
tree | 3cb15d732e93b02986393eb005eeb3a3d7b3493d /src/server.cpp | |
parent | adc52f3f3c041e5914f665b6f96d07f49bbb6487 (diff) | |
download | minetest-c2250d95c4da368d1535794a1c7f2092ce479d7a.tar.gz minetest-c2250d95c4da368d1535794a1c7f2092ce479d7a.tar.bz2 minetest-c2250d95c4da368d1535794a1c7f2092ce479d7a.zip |
Support game-specific minetest.conf
Diffstat (limited to 'src/server.cpp')
-rw-r--r-- | src/server.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/server.cpp b/src/server.cpp index 2dcab63b8..f77ac6ad9 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -58,6 +58,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "util/mathconstants.h" #include "rollback.h" #include "util/serialize.h" +#include "defaultsettings.h" void * ServerThread::Thread() { @@ -687,6 +688,13 @@ Server::Server( infostream<<"- config: "<<m_path_config<<std::endl; infostream<<"- game: "<<m_gamespec.path<<std::endl; + // Initialize default settings and override defaults with those provided + // by the game + set_default_settings(g_settings); + Settings gamedefaults; + getGameMinetestConfig(gamespec.path, gamedefaults); + override_default_settings(g_settings, &gamedefaults); + // Create biome definition manager m_biomedef = new BiomeDefManager(this); |