Remove no virtual dtor warnings, make MapgenParams contain actual NoiseParams

[minetest.git] / src / mapgen_singlenode.cpp

diff --git a/src/mapgen_singlenode.cpp b/src/mapgen_singlenode.cpp
index 04bf02bd1c37fbe5ceb5cbdf5702c920e5a22b62..f05ddd2f4e32a137e3b3188354f1a6fc014c79b7 100644 (file)
--- a/src/mapgen_singlenode.cpp
+++ b/src/mapgen_singlenode.cpp
@@ -72,20 +72,27 @@ void MapgenSinglenode::makeChunk(BlockMakeData *data) {
        v3s16 node_max = (blockpos_max+v3s16(1,1,1))*MAP_BLOCKSIZE-v3s16(1,1,1);
 
        content_t c_node = ndef->getId("mapgen_singlenode");
-       if(c_node == CONTENT_IGNORE)
+       if (c_node == CONTENT_IGNORE)
                c_node = CONTENT_AIR;
-       for(s16 z=node_min.Z; z<=node_max.Z; z++)
-       for(s16 y=node_min.Y; y<=node_max.Y; y++)
-       for(s16 x=node_min.X; x<=node_max.X; x++)
-       {
-               data->vmanip->setNode(v3s16(x,y,z), MapNode(c_node));
+       
+       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);
+               for (s16 x = node_min.X; x <= node_max.X; x++) {
+                       if (vm->m_data[i].getContent() == CONTENT_IGNORE)
+                               vm->m_data[i] = n_node;
+                       i++;
+               }
        }
 
        // Add top and bottom side of water to transforming_liquid queue
        updateLiquid(&data->transforming_liquid, node_min, node_max);
 
        // Calculate lighting
-       calcLighting(node_min, node_max);
+       calcLighting(node_min - v3s16(1, 0, 1) * MAP_BLOCKSIZE,
+                                node_max + v3s16(1, 0, 1) * MAP_BLOCKSIZE);
        
        this->generating = false;
 }