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_v7.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_v7.cpp')
| -rw-r--r-- | src/mapgen_v7.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp index 835915164..a9547fdb0 100644 --- a/src/mapgen_v7.cpp +++ b/src/mapgen_v7.cpp @@ -39,9 +39,9 @@ with this program; if not, write to the Free Software Foundation, Inc., FlagDesc flagdesc_mapgen_v7[] = { - {"v7_mountains", MGV7_MOUNTAINS}, - {"v7_ridges", MGV7_RIDGES}, - {NULL, 0} + {"mountains", MGV7_MOUNTAINS}, + {"ridges", MGV7_RIDGES}, + {NULL, 0} }; /////////////////////////////////////////////////////////////////////////////// @@ -53,10 +53,10 @@ MapgenV7::MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge) { this->emerge = emerge; this->bmgr = emerge->biomedef; - this->seed = (int)params->seed; + this->seed = (int)params->seed; this->water_level = params->water_level; - this->flags = params->flags | MGV7_MOUNTAINS | MGV7_RIDGES; - this->gennotify = emerge->gennotify; + this->flags = params->flags; + this->gennotify = emerge->gennotify; this->csize = v3s16(1, 1, 1) * params->chunksize * MAP_BLOCKSIZE; @@ -141,7 +141,7 @@ void MapgenV7Params::readParams(Settings *settings) { void MapgenV7Params::writeParams(Settings *settings) { - settings->setFlagStr("mgv7_spflags", spflags, flagdesc_mapgen_v7); + settings->setFlagStr("mgv7_spflags", spflags, flagdesc_mapgen_v7, (u32)-1); settings->setNoiseParams("mgv7_np_terrain_base", np_terrain_base); settings->setNoiseParams("mgv7_np_terrain_alt", np_terrain_alt); @@ -262,7 +262,7 @@ void MapgenV7::makeChunk(BlockMakeData *data) { updateLiquid(&data->transforming_liquid, full_node_min, full_node_max); - if (!(flags & MG_NOLIGHT)) + if (flags & MG_LIGHT) calcLighting(node_min - v3s16(1, 0, 1) * MAP_BLOCKSIZE, node_max + v3s16(1, 0, 1) * MAP_BLOCKSIZE); //setLighting(node_min - v3s16(1, 0, 1) * MAP_BLOCKSIZE, |