From 91e88196c7c0e7ee87c1fd4783b3999710510a65 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Tue, 22 Jan 2013 22:32:30 -0500 Subject: Make mapgen factory setup more elegant, add mapgen_v6.h --- src/server.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/server.cpp') diff --git a/src/server.cpp b/src/server.cpp index d227474aa..a8640ad10 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -1097,15 +1097,14 @@ Server::Server( // Add default biomes after nodedef had its aliases added m_biomedef->addDefaultBiomes(); - // Initialize Environment - ServerMap *servermap = new ServerMap(path_world, this); - m_env = new ServerEnvironment(servermap, m_lua, this, this); - // Create emerge manager - m_emerge = new EmergeManager(this, m_biomedef, servermap->getMapgenParams()); + m_emerge = new EmergeManager(this, m_biomedef); - // Give map pointer to the emerge manager - servermap->setEmerge(m_emerge); + // Initialize Environment + ServerMap *servermap = new ServerMap(path_world, this, m_emerge); + m_env = new ServerEnvironment(servermap, m_lua, this, this); + + m_emerge->initMapgens(servermap->getMapgenParams()); // Give environment reference to scripting api scriptapi_add_environment(m_lua, m_env); -- cgit v1.2.3