diff options
| author | kwolekr <kwolekr@minetest.net> | 2014-02-08 17:50:26 -0500 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2014-02-08 17:50:59 -0500 |
| commit | 83bafbe08b508266d31a6a76f1ffc2cddc662390 (patch) | |
| tree | 555f877e367a8e1a00200c3fe3fa889538169291 /src/mapgen_v6.cpp | |
| parent | f4f98c9550325aa8178f99cd32ea8806669aa280 (diff) | |
| download | minetest-83bafbe08b508266d31a6a76f1ffc2cddc662390.tar.gz minetest-83bafbe08b508266d31a6a76f1ffc2cddc662390.tar.bz2 minetest-83bafbe08b508266d31a6a76f1ffc2cddc662390.zip | |
Make flag strings clear specified flag with 'no' prefix
Remove flagmask field from set_mapgen_params table
Add small bits of needed documentation
Diffstat (limited to 'src/mapgen_v6.cpp')
| -rw-r--r-- | src/mapgen_v6.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp index 92ae7dff0..a212496a8 100644 --- a/src/mapgen_v6.cpp +++ b/src/mapgen_v6.cpp @@ -38,10 +38,10 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mapgen_v6.h" FlagDesc flagdesc_mapgen_v6[] = { - {"v6_jungles", MGV6_JUNGLES}, - {"v6_biome_blend", MGV6_BIOME_BLEND}, - {"v6_nomudflow", MGV6_NOMUDFLOW}, - {NULL, 0} + {"jungles", MGV6_JUNGLES}, + {"biomeblend", MGV6_BIOMEBLEND}, + {"mudflow", MGV6_MUDFLOW}, + {NULL, 0} }; /////////////////////////////////////////////////////////////////////////////// @@ -93,7 +93,7 @@ MapgenV6::~MapgenV6() { MapgenV6Params::MapgenV6Params() { - spflags = MGV6_BIOME_BLEND; + spflags = MGV6_BIOMEBLEND | MGV6_MUDFLOW; freq_desert = 0.45; freq_beach = 0.15; @@ -131,7 +131,7 @@ void MapgenV6Params::readParams(Settings *settings) { void MapgenV6Params::writeParams(Settings *settings) { - settings->setFlagStr("mgv6_spflags", spflags, flagdesc_mapgen_v6); + settings->setFlagStr("mgv6_spflags", spflags, flagdesc_mapgen_v6, (u32)-1); settings->setFloat("mgv6_freq_desert", freq_desert); settings->setFloat("mgv6_freq_beach", freq_beach); @@ -365,7 +365,7 @@ BiomeType MapgenV6::getBiome(int index, v2s16 p) if (d > freq_desert) return BT_DESERT; - if ((spflags & MGV6_BIOME_BLEND) && + if ((spflags & MGV6_BIOMEBLEND) && (d > freq_desert - 0.10) && ((noise2d(p.X, p.Y, seed) + 1.0) > (freq_desert - d) * 20.0)) return BT_DESERT; @@ -481,7 +481,7 @@ void MapgenV6::makeChunk(BlockMakeData *data) { addDirtGravelBlobs(); // Flow mud away from steep edges - if (!(spflags & MGV6_NOMUDFLOW)) + if (spflags & MGV6_MUDFLOW) flowMud(mudflow_minpos, mudflow_maxpos); } @@ -543,7 +543,7 @@ void MapgenV6::makeChunk(BlockMakeData *data) { } // Calculate lighting - if (!(flags & MG_NOLIGHT)) + if (flags & MG_LIGHT) calcLighting(node_min - v3s16(1, 1, 1) * MAP_BLOCKSIZE, node_max + v3s16(1, 0, 1) * MAP_BLOCKSIZE); |