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/mapgen.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/mapgen.h')
-rw-r--r-- | src/mapgen.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mapgen.h b/src/mapgen.h index 7aac1e6a0..c4e1652e8 100644 --- a/src/mapgen.h +++ b/src/mapgen.h @@ -124,6 +124,7 @@ struct MapgenParams { s16 chunksize; u64 seed; s16 water_level; + s16 mapgen_limit; u32 flags; BiomeParams *bparams; @@ -133,6 +134,7 @@ struct MapgenParams { chunksize(5), seed(0), water_level(1), + mapgen_limit(MAX_MAP_GENERATION_LIMIT), flags(MG_CAVES | MG_LIGHT | MG_DECORATIONS), bparams(NULL) { @@ -158,6 +160,7 @@ class Mapgen { public: s32 seed; int water_level; + int mapgen_limit; u32 flags; bool generating; int id; |