diff options
| author | kwolekr <kwolekr@minetest.net> | 2014-02-03 22:42:10 -0500 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2014-02-03 22:50:14 -0500 |
| commit | 5a34f40d80ea1a339b599bc11db549a6bd86912f (patch) | |
| tree | 07ead9e3ff4732479af41b739a26b5dc8182c5fd /src/server.cpp | |
| parent | a439343844cf821e4922e23f1638b92e2cfb14ac (diff) | |
| download | minetest-5a34f40d80ea1a339b599bc11db549a6bd86912f.tar.gz minetest-5a34f40d80ea1a339b599bc11db549a6bd86912f.tar.bz2 minetest-5a34f40d80ea1a339b599bc11db549a6bd86912f.zip | |
Huge overhaul of the entire MapgenParams system
MapgenParams is no longer a polymorphic class, eliminating the need for messy and bug-prone reallocations.
Separation between the common and mapgen-specific parameters is now strongly defined.
Mapgen parameters objects are now properly encapsulated within the proper subsystems.
Diffstat (limited to 'src/server.cpp')
| -rw-r--r-- | src/server.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/server.cpp b/src/server.cpp index 5dde78e60..00db9128d 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -348,12 +348,10 @@ Server::Server( m_clients.setEnv(m_env); // Run some callbacks after the MG params have been set up but before activation - MapgenParams *mgparams = servermap->getMapgenParams(); - m_script->environment_OnMapgenInit(mgparams); + m_script->environment_OnMapgenInit(&m_emerge->params); // Initialize mapgens - m_emerge->initMapgens(mgparams); - servermap->setMapgenParams(m_emerge->params); + m_emerge->initMapgens(); // Give environment reference to scripting api m_script->initializeEnvironment(m_env); @@ -4779,7 +4777,7 @@ v3f findSpawnPos(ServerMap &map) #endif #if 1 - s16 water_level = map.m_mgparams->water_level; + s16 water_level = map.getWaterLevel(); // Try to find a good place a few times for(s32 i=0; i<1000; i++) |