summaryrefslogtreecommitdiff
path: root/src/server.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/server.cpp')
-rw-r--r--src/server.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/server.cpp b/src/server.cpp
index a3c0b66ed..22c828bc2 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -172,8 +172,12 @@ void * EmergeThread::Thread()
ServerMap &map = ((ServerMap&)m_server->m_env->getMap());
EmergeManager *emerge = m_server->m_emerge;
- Mapgen *mapgen = new Mapgen( m_server->m_emerge->biomedef,/*mapgenid*/ 0, map.getSeed()); ////////fix this...!
+ Mapgen *mapgen;
+ if (g_settings->getS16("use_mapgen_version") == 7) ////////this is okay for now, fix later
+ mapgen = new MapgenV7( m_server->m_emerge->biomedef,/*mapgenid*/ 0, map.getSeed());
+ else
+ mapgen = new MapgenV6(0, map.getSeed());
/*
Get block info from queue, emerge them and send them
to clients.