summaryrefslogtreecommitdiff
path: root/src/server.cpp
diff options
context:
space:
mode:
authorkwolekr <mirrorisim@gmail.com>2012-12-22 00:34:35 -0500
committerPerttu Ahola <celeron55@gmail.com>2013-01-21 21:41:37 +0200
commitd5029958b9017ad89775bc4f68c4de3db603e618 (patch)
tree757d6e545217c3b0da34d66d00f1e5a99aeb22a2 /src/server.cpp
parentbddd5f2b98a56fc735d5687ecd0b43767aec8066 (diff)
downloadminetest-d5029958b9017ad89775bc4f68c4de3db603e618.tar.gz
minetest-d5029958b9017ad89775bc4f68c4de3db603e618.tar.bz2
minetest-d5029958b9017ad89775bc4f68c4de3db603e618.zip
Readded and optimized mapgen V6
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.