src/client/tile.cpp: Fix reference counting

[minetest.git] / src / cavegen.h

diff --git a/src/cavegen.h b/src/cavegen.h
index a908c61d83105ee9e28f981056d738fa865880b5..5d150802aa8bae523d531942b59ad5caeb5c8733 100644 (file)
--- a/src/cavegen.h
+++ b/src/cavegen.h
@@ -21,14 +21,61 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define CAVEGEN_HEADER
 
 #define VMANIP_FLAG_CAVE VOXELFLAG_CHECKED1
+#define MGV7_LAVA_DEPTH -256
 
+class MapgenV5;
 class MapgenV6;
 class MapgenV7;
 
+class CaveV5 {
+public:
+       MapgenV5 *mg;
+       MMVManip *vm;
+       INodeDefManager *ndef;
+
+       NoiseParams *np_caveliquids;
+
+       s16 min_tunnel_diameter;
+       s16 max_tunnel_diameter;
+       u16 tunnel_routepoints;
+       int dswitchint;
+       int part_max_length_rs;
+
+       bool large_cave_is_flat;
+       bool flooded;
+
+       s16 max_stone_y;
+       v3s16 node_min;
+       v3s16 node_max;
+
+       v3f orp;  // starting point, relative to caved space
+       v3s16 of; // absolute coordinates of caved space
+       v3s16 ar; // allowed route area
+       s16 rs;   // tunnel radius size
+       v3f main_direction;
+
+       s16 route_y_min;
+       s16 route_y_max;
+
+       PseudoRandom *ps;
+
+       content_t c_water_source;
+       content_t c_lava_source;
+       content_t c_ice;
+
+       int water_level;
+
+       CaveV5() {}
+       CaveV5(MapgenV5 *mg, PseudoRandom *ps);
+       void makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height);
+       void makeTunnel(bool dirswitch);
+       void carveRoute(v3f vec, float f, bool randomize_xz);
+};
+
 class CaveV6 {
 public:
        MapgenV6 *mg;
-       ManualMapVoxelManipulator *vm;
+       MMVManip *vm;
        INodeDefManager *ndef;
 
        s16 min_tunnel_diameter;
@@ -44,22 +91,22 @@ class CaveV6 {
        s16 max_stone_y;
        v3s16 node_min;
        v3s16 node_max;
-       
+
        v3f orp;  // starting point, relative to caved space
        v3s16 of; // absolute coordinates of caved space
        v3s16 ar; // allowed route area
        s16 rs;   // tunnel radius size
        v3f main_direction;
-       
+
        s16 route_y_min;
        s16 route_y_max;
-       
+
        PseudoRandom *ps;
        PseudoRandom *ps2;
-       
+
        content_t c_water_source;
        content_t c_lava_source;
-       
+
        int water_level;
 
        CaveV6() {}
@@ -72,7 +119,7 @@ class CaveV6 {
 class CaveV7 {
 public:
        MapgenV7 *mg;
-       ManualMapVoxelManipulator *vm;
+       MMVManip *vm;
        INodeDefManager *ndef;
 
        NoiseParams *np_caveliquids;
@@ -83,35 +130,35 @@ class CaveV7 {
        int dswitchint;
        int part_max_length_rs;
 
-       bool large_cave;
        bool large_cave_is_flat;
        bool flooded;
 
        s16 max_stone_y;
        v3s16 node_min;
        v3s16 node_max;
-       
+
        v3f orp;  // starting point, relative to caved space
        v3s16 of; // absolute coordinates of caved space
        v3s16 ar; // allowed route area
        s16 rs;   // tunnel radius size
        v3f main_direction;
-       
+
        s16 route_y_min;
        s16 route_y_max;
-       
+
        PseudoRandom *ps;
-       
+
        content_t c_water_source;
        content_t c_lava_source;
-       
+       content_t c_ice;
+
        int water_level;
 
        CaveV7() {}
-       CaveV7(MapgenV7 *mg, PseudoRandom *ps, bool large_cave);
+       CaveV7(MapgenV7 *mg, PseudoRandom *ps);
        void makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height);
        void makeTunnel(bool dirswitch);
-       void carveRoute(v3f vec, float f, bool randomize_xz, bool is_ravine);
+       void carveRoute(v3f vec, float f, bool randomize_xz);
 };
 
 #endif