Fix a crash (assert) when client set serial version < 24 in INIT

[minetest.git] / src / cavegen.h

diff --git a/src/cavegen.h b/src/cavegen.h
index 7822816d6abc9a828c0291ac29358d521860bd49..7371df6fa54a5e928896e474d222cc95fb2fda13 100644 (file)
--- a/src/cavegen.h
+++ b/src/cavegen.h
@@ -28,7 +28,7 @@ class MapgenV7;
 class CaveV6 {
 public:
        MapgenV6 *mg;
-       ManualMapVoxelManipulator *vm;
+       MMVManip *vm;
        INodeDefManager *ndef;
 
        s16 min_tunnel_diameter;
@@ -44,22 +44,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,9 +72,11 @@ class CaveV6 {
 class CaveV7 {
 public:
        MapgenV7 *mg;
-       ManualMapVoxelManipulator *vm;
+       MMVManip *vm;
        INodeDefManager *ndef;
 
+       NoiseParams *np_caveliquids;
+
        s16 min_tunnel_diameter;
        s16 max_tunnel_diameter;
        u16 tunnel_routepoints;
@@ -88,21 +90,22 @@ class CaveV7 {
        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() {}