Commented out debug statements again

[oweals/minetest.git] / src / mapgen.cpp

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 0ba7f91abadb9d71178f0ed4bab29f84b04e553b..0018b9919355a065cef2ca5270a96bbc3d075eee 100644 (file)
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -976,6 +976,40 @@ static void make_dungeon1(VoxelManipulator &vmanip, PseudoRandom &random)
        }
 }
 
+static void make_nc(VoxelManipulator &vmanip, PseudoRandom &random)
+{
+       v3s16 dir;
+       u8 facedir_i = 0;
+       s32 r = random.range(0, 3);
+       if(r == 0){
+               dir = v3s16( 1, 0, 0);
+               facedir_i = 3;
+       }
+       if(r == 1){
+               dir = v3s16(-1, 0, 0);
+               facedir_i = 1;
+       }
+       if(r == 2){
+               dir = v3s16( 0, 0, 1);
+               facedir_i = 2;
+       }
+       if(r == 3){
+               dir = v3s16( 0, 0,-1);
+               facedir_i = 0;
+       }
+       v3s16 p = vmanip.m_area.MinEdge + v3s16(
+                       16+random.range(0,15),
+                       16+random.range(0,15),
+                       16+random.range(0,15));
+       vmanip.m_data[vmanip.m_area.index(p)] = MapNode(CONTENT_NC, facedir_i);
+       u32 length = random.range(3,15);
+       for(u32 j=0; j<length; j++)
+       {
+               p -= dir;
+               vmanip.m_data[vmanip.m_area.index(p)] = MapNode(CONTENT_NC_RB);
+       }
+}
+
 /*
        Noise functions. Make sure seed is mangled differently in each one.
 */
@@ -1518,7 +1552,7 @@ void make_block(BlockMakeData *data)
        /*
                Create a block-specific seed
        */
-       u32 blockseed = (u32)(data->seed%0x100000000) + full_node_min.Z*38134234
+       u32 blockseed = (u32)(data->seed%0x100000000ULL) + full_node_min.Z*38134234
                        + full_node_min.Y*42123 + full_node_min.X*23;
        
        /*
@@ -1783,6 +1817,16 @@ void make_block(BlockMakeData *data)
                                                if(noisebuf_ground_wetness.get(x,y,z) < -0.6)
                                                        vmanip.m_data[i] = MapNode(CONTENT_GRAVEL);
                                        }
+                                       else if(noisebuf_ground_crumbleness.get(x,y,z) <
+                                                       -3.0 + MYMIN(0.1 * sqrt((float)MYMAX(0, -y)), 1.5))
+                                       {
+                                               vmanip.m_data[i] = MapNode(CONTENT_LAVASOURCE);
+                                               for(s16 x1=-1; x1<=1; x1++)
+                                               for(s16 y1=-1; y1<=1; y1++)
+                                               for(s16 z1=-1; z1<=1; z1++)
+                                                       data->transforming_liquid.push_back(
+                                                                       v3s16(p2d.X+x1, y+y1, p2d.Y+z1));
+                                       }
                                }
 
                                data->vmanip->m_area.add_y(em, i, -1);
@@ -1871,6 +1915,17 @@ void make_block(BlockMakeData *data)
                        }
                }
        }
+
+       /*
+               Add NC
+       */
+       {
+               PseudoRandom ncrandom(blockseed+9324342);
+               if(ncrandom.range(0, 1000) == 0 && blockpos.Y <= -3)
+               {
+                       make_nc(vmanip, ncrandom);
+               }
+       }
        
        /*
                Add top and bottom side of water to transforming_liquid queue