diff options
| author | paramat <mat.gregory@virginmedia.com> | 2016-02-04 01:03:31 +0000 |
|---|---|---|
| committer | paramat <mat.gregory@virginmedia.com> | 2016-02-09 07:14:45 +0000 |
| commit | 4adbd69a3701608876b50665ed3f7a150750d26e (patch) | |
| tree | de3ec585173cbf4e480004c8d64c23489222677f /src/server.cpp | |
| parent | 38e712260046f159aa201259569054bdf9793b7f (diff) | |
| download | minetest-4adbd69a3701608876b50665ed3f7a150750d26e.tar.gz minetest-4adbd69a3701608876b50665ed3f7a150750d26e.tar.bz2 minetest-4adbd69a3701608876b50665ed3f7a150750d26e.zip | |
FindSpawnPos: Let mapgens decide what spawn altitude is suitable
To avoid spawn search failing in new specialised mapgens
Increase spawn search range to 4000 nodes
Add getSpawnLevelAtPoint() functions to EmergeManager, class Mapgen
and all mapgens
Remove getGroundLevelAtPoint() functions from all mapgens except mgv6
(possibly to be re-added later in the correct form to return actual
ground level)
Make mgvalleys flag names consistent with other mapgens
Remove now unused 'vertical spawn range' setting
Diffstat (limited to 'src/server.cpp')
| -rw-r--r-- | src/server.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/server.cpp b/src/server.cpp index 86096055d..572533146 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -3383,26 +3383,24 @@ v3f Server::findSpawnPos() return nodeposf * BS; } - s16 water_level = map.getWaterLevel(); - s16 vertical_spawn_range = g_settings->getS16("vertical_spawn_range"); bool is_good = false; // Try to find a good place a few times - for(s32 i = 0; i < 1000 && !is_good; i++) { + for(s32 i = 0; i < 4000 && !is_good; i++) { s32 range = 1 + i; // We're going to try to throw the player to this position v2s16 nodepos2d = v2s16( -range + (myrand() % (range * 2)), -range + (myrand() % (range * 2))); - // Get ground height at point - s16 groundheight = map.findGroundLevel(nodepos2d); - // Don't go underwater or to high places - if (groundheight <= water_level || - groundheight > water_level + vertical_spawn_range) + // Get spawn level at point + s16 spawn_level = m_emerge->getSpawnLevelAtPoint(nodepos2d); + // Continue if MAX_MAP_GENERATION_LIMIT was returned by + // the mapgen to signify an unsuitable spawn position + if (spawn_level == MAX_MAP_GENERATION_LIMIT) continue; - v3s16 nodepos(nodepos2d.X, groundheight, nodepos2d.Y); + v3s16 nodepos(nodepos2d.X, spawn_level, nodepos2d.Y); s32 air_count = 0; for (s32 i = 0; i < 10; i++) { |