aboutsummaryrefslogtreecommitdiff
path: root/src/mapgen_v6.h
diff options
context:
space:
mode:
authorWeblate <42@minetest.ru>2013-04-22 22:37:16 +0200
committerWeblate <42@minetest.ru>2013-04-22 22:37:16 +0200
commit418c2e7a446f8f0aca9f8bd23005a5896869ef7e (patch)
tree8c5e67eb5bc538174e768002c5419e86600c0623 /src/mapgen_v6.h
parent4117ab473bcc393f6081277df96dd27c898c90ad (diff)
parent58ded5cd27dd6e5ba740b22d8a3b0917f3d98150 (diff)
downloadminetest-418c2e7a446f8f0aca9f8bd23005a5896869ef7e.tar.gz
minetest-418c2e7a446f8f0aca9f8bd23005a5896869ef7e.tar.bz2
minetest-418c2e7a446f8f0aca9f8bd23005a5896869ef7e.zip
Merge remote branch 'origin/master'
Diffstat (limited to 'src/mapgen_v6.h')
-rw-r--r--src/mapgen_v6.h17
1 files changed, 2 insertions, 15 deletions
diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h
index d37e406cb..a0276fb59 100644
--- 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 @@ public:
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 {