diff options
| author | paramat <mat.gregory@virginmedia.com> | 2017-03-23 00:18:59 +0000 |
|---|---|---|
| committer | paramat <mat.gregory@virginmedia.com> | 2017-03-27 03:18:09 +0100 |
| commit | ec0c4d33db9e0b7b3e541757e34c04c08c3b48c9 (patch) | |
| tree | a1d31e46b60906c71c9aa29a0588d6016b63f6d3 /src/mapblock.h | |
| parent | 09f2cd0264993e7b81d84d77bfc670b40ef82444 (diff) | |
| download | minetest-ec0c4d33db9e0b7b3e541757e34c04c08c3b48c9.tar.gz minetest-ec0c4d33db9e0b7b3e541757e34c04c08c3b48c9.tar.bz2 minetest-ec0c4d33db9e0b7b3e541757e34c04c08c3b48c9.zip | |
Map generation limit: Make per-world
The setting limits map generation but affects nothing else.
Add 'mapgen_limit' to global mapgen parameters.
Move 'blockpos_over_mapgen_limit()' to the only place it is called
from: map.cpp.
Allow teleportation to any part of the world even if over the set
mapgen limit.
Simplify the reading of this limit in mgvalleys.
Remove the 'map_generation_limit' setting.
Diffstat (limited to 'src/mapblock.h')
| -rw-r--r-- | src/mapblock.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/mapblock.h b/src/mapblock.h index be2edc791..c48f337e0 100644 --- a/src/mapblock.h +++ b/src/mapblock.h @@ -32,6 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "modifiedstate.h" #include "util/numeric.h" // getContainerPos #include "settings.h" +#include "mapgen.h" class Map; class NodeMetadataList; @@ -689,19 +690,6 @@ inline bool blockpos_over_max_limit(v3s16 p) p.Z > max_limit_bp; } -inline bool blockpos_over_mapgen_limit(v3s16 p) -{ - const s16 mapgen_limit_bp = rangelim( - g_settings->getS16("map_generation_limit"), 0, MAX_MAP_GENERATION_LIMIT) / - MAP_BLOCKSIZE; - return p.X < -mapgen_limit_bp || - p.X > mapgen_limit_bp || - p.Y < -mapgen_limit_bp || - p.Y > mapgen_limit_bp || - p.Z < -mapgen_limit_bp || - p.Z > mapgen_limit_bp; -} - /* Returns the position of the block where the node is located */ |