diff options
| author | kwolekr <kwolekr@minetest.net> | 2013-03-24 01:43:38 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2013-03-24 13:23:33 -0400 |
| commit | 57cbb8bfd8daaa1b8b1aa876723ff6355d21f7fc (patch) | |
| tree | 99b6ce58417103e4271aae2db63cce9c3d85db1d /src/server.cpp | |
| parent | f70378f7f57f293a2a0afcf35aec8ee67180a6c0 (diff) | |
| download | minetest-57cbb8bfd8daaa1b8b1aa876723ff6355d21f7fc.tar.gz minetest-57cbb8bfd8daaa1b8b1aa876723ff6355d21f7fc.tar.bz2 minetest-57cbb8bfd8daaa1b8b1aa876723ff6355d21f7fc.zip | |
Add Ore infrastructure and l_register_ore()
Diffstat (limited to 'src/server.cpp')
| -rw-r--r-- | src/server.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/server.cpp b/src/server.cpp index 644f89349..db05b95cc 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -653,7 +653,6 @@ Server::Server( m_craftdef(createCraftDefManager()), m_event(new EventManager()), m_thread(this), - //m_emergethread(this), m_time_of_day_send_timer(0), m_uptime(0), m_shutdown_requested(false), @@ -698,7 +697,10 @@ Server::Server( // Create biome definition manager m_biomedef = new BiomeDefManager(this); - + + // Create emerge manager + m_emerge = new EmergeManager(this, m_biomedef); + // Create rollback manager std::string rollback_path = m_path_world+DIR_DELIM+"rollback.txt"; m_rollback = createRollbackManager(rollback_path, this); @@ -814,9 +816,6 @@ Server::Server( // Add default biomes after nodedef had its aliases added m_biomedef->addDefaultBiomes(); - // Create emerge manager - m_emerge = new EmergeManager(this, m_biomedef); - // Initialize Environment ServerMap *servermap = new ServerMap(path_world, this, m_emerge); m_env = new ServerEnvironment(servermap, m_lua, this, this); |