diff options
author | kwolekr <kwolekr@minetest.net> | 2014-12-06 04:18:04 -0500 |
---|---|---|
committer | kwolekr <kwolekr@minetest.net> | 2014-12-06 13:53:35 -0500 |
commit | 5062b99cb0d252d9e377ff4560f7ecc9e66fd558 (patch) | |
tree | 3474c0734aac243cabfcf3af763becb4025da35b /src/mapgen_singlenode.cpp | |
parent | 2b119e1e192ead701e69e261fe94ccb7382dbee7 (diff) | |
download | hax-minetest-server-5062b99cb0d252d9e377ff4560f7ecc9e66fd558.tar.gz hax-minetest-server-5062b99cb0d252d9e377ff4560f7ecc9e66fd558.zip |
Rewrite generate notification mechanism
Add support for notify-on-decoration
Clean up mapgen constructors
Clean up mapgen.cpp code style somewhat
Remove trailing whitespace from some files
Diffstat (limited to 'src/mapgen_singlenode.cpp')
-rw-r--r-- | src/mapgen_singlenode.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/mapgen_singlenode.cpp b/src/mapgen_singlenode.cpp index 9f2e6c122..8558b3b14 100644 --- a/src/mapgen_singlenode.cpp +++ b/src/mapgen_singlenode.cpp @@ -39,7 +39,8 @@ void MapgenSinglenodeParams::writeParams(Settings *settings) { /////////////////////////////////////////////////////////////////////////////// MapgenSinglenode::MapgenSinglenode(int mapgenid, - MapgenParams *params, EmergeManager *emerge) + MapgenParams *params, EmergeManager *emerge) + : Mapgen(mapgenid, params, emerge) { flags = params->flags; @@ -67,18 +68,18 @@ void MapgenSinglenode::makeChunk(BlockMakeData *data) { data->blockpos_requested.Z <= data->blockpos_max.Z); this->generating = true; - this->vm = data->vmanip; + this->vm = data->vmanip; this->ndef = data->nodedef; - + v3s16 blockpos_min = data->blockpos_min; v3s16 blockpos_max = data->blockpos_max; // Area of central chunk v3s16 node_min = blockpos_min*MAP_BLOCKSIZE; v3s16 node_max = (blockpos_max+v3s16(1,1,1))*MAP_BLOCKSIZE-v3s16(1,1,1); - + MapNode n_node(c_node); - + for (s16 z = node_min.Z; z <= node_max.Z; z++) for (s16 y = node_min.Y; y <= node_max.Y; y++) { u32 i = vm->m_area.index(node_min.X, y, z); @@ -96,7 +97,7 @@ void MapgenSinglenode::makeChunk(BlockMakeData *data) { if (flags & MG_LIGHT) calcLighting(node_min - v3s16(1, 0, 1) * MAP_BLOCKSIZE, node_max + v3s16(1, 0, 1) * MAP_BLOCKSIZE); - + this->generating = false; } |