diff options
author | paramat <paramat@users.noreply.github.com> | 2017-06-04 22:28:32 +0100 |
---|---|---|
committer | paramat <mat.gregory@virginmedia.com> | 2017-06-11 02:11:08 +0100 |
commit | 842acbfad2b70550c562f6429d02c980912d2273 (patch) | |
tree | 8c17ebc69f973dcbf6bbd641251a9242dc010b83 /src/mapgen.cpp | |
parent | a9f02ab51cd4b92a98d7b6dffe6d2838796ba9cc (diff) | |
download | minetest-842acbfad2b70550c562f6429d02c980912d2273.tar.gz minetest-842acbfad2b70550c562f6429d02c980912d2273.tar.bz2 minetest-842acbfad2b70550c562f6429d02c980912d2273.zip |
(Re)spawn players within 'mapgen_limit'
Previously, findSpawnPos() did not take the 'mapgen_limit' setting into account,
a small limit often resulted in a spawn out in the void.
Use the recently added 'calcMapgenEdges()' to get max spawn range through a new
mapgenParams function 'getSpawnRangeMax()'.
Previously, when a player respawned into a world, 'objectpos_over_limit()' was
used as a check, which was inaccurate.
Use the recently added 'saoPosOverLimit()' to get exact mapgen edges.
Also fix default value of 'm_sao_limit_min'.
Diffstat (limited to 'src/mapgen.cpp')
-rw-r--r-- | src/mapgen.cpp | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/src/mapgen.cpp b/src/mapgen.cpp index 1f7f98621..1aa3be302 100644 --- a/src/mapgen.cpp +++ b/src/mapgen.cpp @@ -1053,12 +1053,13 @@ void MapgenParams::writeParams(Settings *settings) const // 'mapgen_limit'), and corresponding exact limits for SAO entities. void MapgenParams::calcMapgenEdges() { + if (m_mapgen_edges_calculated) + return; + // Central chunk offset, in blocks s16 ccoff_b = -chunksize / 2; - // Chunksize, in nodes s32 csize_n = chunksize * MAP_BLOCKSIZE; - // Minp/maxp of central chunk, in nodes s16 ccmin = ccoff_b * MAP_BLOCKSIZE; s16 ccmax = ccmin + csize_n - 1; @@ -1077,21 +1078,21 @@ void MapgenParams::calcMapgenEdges() s16 numcmin = MYMAX((ccfmin - mapgen_limit_min) / csize_n, 0); s16 numcmax = MYMAX((mapgen_limit_max - ccfmax) / csize_n, 0); // Mapgen edges, in nodes - // These values may be useful later as additional class members - s16 mapgen_edge_min = ccmin - numcmin * csize_n; - s16 mapgen_edge_max = ccmax + numcmax * csize_n; + mapgen_edge_min = ccmin - numcmin * csize_n; + mapgen_edge_max = ccmax + numcmax * csize_n; // SAO position limits, in Irrlicht units m_sao_limit_min = mapgen_edge_min * BS - 3.0f; m_sao_limit_max = mapgen_edge_max * BS + 3.0f; + + m_mapgen_edges_calculated = true; } bool MapgenParams::saoPosOverLimit(const v3f &p) { - if (!m_sao_limit_calculated) { + if (!m_mapgen_edges_calculated) calcMapgenEdges(); - m_sao_limit_calculated = true; - } + return p.X < m_sao_limit_min || p.X > m_sao_limit_max || p.Y < m_sao_limit_min || @@ -1099,3 +1100,11 @@ bool MapgenParams::saoPosOverLimit(const v3f &p) p.Z < m_sao_limit_min || p.Z > m_sao_limit_max; } + + +s32 MapgenParams::getSpawnRangeMax() +{ + calcMapgenEdges(); + + return MYMIN(-mapgen_edge_min, mapgen_edge_max); +} |