Mgvalleys: use standard caves

[minetest.git] / src / mapgen_singlenode.cpp

diff --git a/src/mapgen_singlenode.cpp b/src/mapgen_singlenode.cpp
index 8b6c25a59ea8065fd25245441733a18af76b3ee3..f87115269e3f0771ae47551d1a09f57b1d72d05f 100644 (file)
--- a/src/mapgen_singlenode.cpp
+++ b/src/mapgen_singlenode.cpp
@@ -38,6 +38,9 @@ MapgenSinglenode::MapgenSinglenode(int mapgenid,
        c_node = ndef->getId("mapgen_singlenode");
        if (c_node == CONTENT_IGNORE)
                c_node = CONTENT_AIR;
+
+       MapNode n_node(c_node);
+       set_light = (ndef->get(n_node).sunlight_propagates) ? LIGHT_SUN : 0x00;
 }
 
 
@@ -45,6 +48,7 @@ MapgenSinglenode::~MapgenSinglenode()
 {
 }
 
+
 //////////////////////// Map generator
 
 void MapgenSinglenode::makeChunk(BlockMakeData *data)
@@ -53,11 +57,11 @@ void MapgenSinglenode::makeChunk(BlockMakeData *data)
        assert(data->vmanip);
        assert(data->nodedef);
        assert(data->blockpos_requested.X >= data->blockpos_min.X &&
-                  data->blockpos_requested.Y >= data->blockpos_min.Y &&
-                  data->blockpos_requested.Z >= data->blockpos_min.Z);
+               data->blockpos_requested.Y >= data->blockpos_min.Y &&
+               data->blockpos_requested.Z >= data->blockpos_min.Z);
        assert(data->blockpos_requested.X <= data->blockpos_max.X &&
-                  data->blockpos_requested.Y <= data->blockpos_max.Y &&
-                  data->blockpos_requested.Z <= data->blockpos_max.Z);
+               data->blockpos_requested.Y <= data->blockpos_max.Y &&
+               data->blockpos_requested.Z <= data->blockpos_max.Z);
 
        this->generating = true;
        this->vm   = data->vmanip;
@@ -67,8 +71,8 @@ void MapgenSinglenode::makeChunk(BlockMakeData *data)
        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);
+       v3s16 node_min = blockpos_min * MAP_BLOCKSIZE;
+       v3s16 node_max = (blockpos_max + v3s16(1, 1, 1)) * MAP_BLOCKSIZE - v3s16(1, 1, 1);
 
        blockseed = getBlockSeed2(node_min, data->seed);
 
@@ -87,15 +91,15 @@ void MapgenSinglenode::makeChunk(BlockMakeData *data)
        // Add top and bottom side of water to transforming_liquid queue
        updateLiquid(&data->transforming_liquid, node_min, node_max);
 
-       // Calculate lighting
-       if (flags & MG_LIGHT)
-               calcLighting(node_min, node_max);
+       // Set lighting
+       if ((flags & MG_LIGHT) && set_light == LIGHT_SUN)
+               setLighting(LIGHT_SUN, node_min, node_max);
 
        this->generating = false;
 }
 
+
 int MapgenSinglenode::getGroundLevelAtPoint(v2s16 p)
 {
        return 0;
 }
-