Merge remote branch 'origin/master'

[dragonfireclient.git] / src / mapgen_v6.h

diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h
index d37e406cbcb1d65933e31ae51d8aa4c07b8edd92..a0276fb591d007ea511655a8eb9e9509ead69e86 100644 (file)
--- a/src/mapgen_v6.h
+++ b/src/mapgen_v6.h
@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapgen.h"
 
 #define AVERAGE_MUD_AMOUNT 4
-#define VMANIP_FLAG_CAVE VOXELFLAG_CHECKED1
 
 enum BiomeType
 {
@@ -43,16 +42,6 @@ extern NoiseParams nparams_v6_def_humidity;
 extern NoiseParams nparams_v6_def_trees;
 extern NoiseParams nparams_v6_def_apple_trees;
 
-struct Cave {
-       s16 min_tunnel_diameter;
-       s16 max_tunnel_diameter;
-       int dswitchint;
-       u16 tunnel_routepoints;
-       int part_max_length_rs;
-       bool large_cave_is_flat;
-       bool flooded;
-};
-
 struct MapgenV6Params : public MapgenParams {
        float freq_desert;
        float freq_beach;
@@ -166,10 +155,8 @@ class MapgenV6 : public Mapgen {
        void addDirtGravelBlobs();
        void growGrass();
        void placeTreesAndJungleGrass();
-       virtual void defineCave(Cave &cave, PseudoRandom ps,
-                                                       v3s16 node_min, bool large_cave);
-       void generateCaves(int max_stone_y);
-       virtual void generateSomething() {}; //for next mapgen
+       virtual void generateCaves(int max_stone_y);
+       virtual void generateExperimental() {}
 };
 
 struct MapgenFactoryV6 : public MapgenFactory {