diff options
| author | kwolekr <kwolekr@minetest.net> | 2013-04-06 11:19:59 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2013-04-07 00:50:21 -0400 |
| commit | 8ec3fc35c656544a55f7f8ece9359c9e2b472e8f (patch) | |
| tree | 430e173e418763fb80f5b43c79c0344dd272d878 /src/server.cpp | |
| parent | d50b2ede92bb33d6f471be34cd7e64efc6434c6b (diff) | |
| download | hax-minetest-server-8ec3fc35c656544a55f7f8ece9359c9e2b472e8f.tar.gz hax-minetest-server-8ec3fc35c656544a55f7f8ece9359c9e2b472e8f.zip | |
Add Mapgen V7, reorganize biomes
Diffstat (limited to 'src/server.cpp')
| -rw-r--r-- | src/server.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/server.cpp b/src/server.cpp index c4dd0ab0f..05075a72c 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -646,7 +646,6 @@ Server::Server( m_rollback_sink_enabled(true), m_enable_rollback_recording(false), m_emerge(NULL), - m_biomedef(NULL), m_lua(NULL), m_itemdef(createItemDefManager()), m_nodedef(createNodeDefManager()), @@ -694,12 +693,9 @@ Server::Server( Settings gamedefaults; getGameMinetestConfig(gamespec.path, gamedefaults); override_default_settings(g_settings, &gamedefaults); - - // Create biome definition manager - m_biomedef = new BiomeDefManager(this); // Create emerge manager - m_emerge = new EmergeManager(this, m_biomedef); + m_emerge = new EmergeManager(this); // Create rollback manager std::string rollback_path = m_path_world+DIR_DELIM+"rollback.txt"; @@ -813,9 +809,6 @@ Server::Server( // Apply item aliases in the node definition manager m_nodedef->updateAliases(m_itemdef); - // Add default biomes after nodedef had its aliases added - m_biomedef->addDefaultBiomes(); - // Initialize Environment ServerMap *servermap = new ServerMap(path_world, this, m_emerge); m_env = new ServerEnvironment(servermap, m_lua, this, this); |